Translation updates

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

1 files changed, 3850 insertions, 1669 deletions

diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 1e7f0c2a7..b0a0ee46f 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -1,14 +1,269 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0">
-<defaultcodec>UTF-8</defaultcodec>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1">
+<context>
+    <name>BtDeviceSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/>
+        <source>Remote Bluetooth device selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/>
+        <source>Discovered devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/>
+        <source>Save</source>
+        <translation>שמור</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="54"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/>
+        <source>Quit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/>
+        <source>Scan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="22"/>
+        <source>Local Bluetooth device details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="128"/>
+        <source>Name: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/>
+        <source>Address:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="26"/>
+        <source>Bluetooth powered on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/>
+        <source>Turn on/off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="23"/>
+        <source>Select device:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="25"/>
+        <source>Name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/>
+        <source>Trying to turn on the local Bluetooth device...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="131"/>
+        <source>Trying to turn off the local Bluetooth device...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="177"/>
+        <source>Scanning for remote devices...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="186"/>
+        <source>Scanning finished successfully.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="219"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="333"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/>
+        <source>UNPAIRED</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="223"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="338"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="351"/>
+        <source>PAIRED</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="343"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="352"/>
+        <source>AUTHORIZED_PAIRED</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/>
+        <source>%1 (%2)   [State: %3]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="247"/>
+        <source>The device %1 can be used for connection. You can press the Save button.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="256"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="369"/>
+        <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="280"/>
+        <source>The local device was changed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="300"/>
+        <source>Pair</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="161"/>
+        <source>Remote devices list was cleared.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/>
+        <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="../qt-ui/btdeviceselectiondialog.cpp" line="203"/>
+        <source>turned on</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/>
+        <source>turned off</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/>
+        <source>Remove pairing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/>
+        <source>Trying to pair device %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="321"/>
+        <source>Trying to unpair device %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="334"/>
+        <source>Device %1 was unpaired.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/>
+        <source>Device %1 was paired.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/>
+        <source>Device %1 was authorized paired.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="372"/>
+        <source>The device %1 can now be used for connection. You can press the Save button.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="384"/>
+        <source>Local device error: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="385"/>
+        <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/>
+        <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="399"/>
+        <source>Writing to or reading from the device resulted in an error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="405"/>
+        <source>An unknown error has occurred.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="410"/>
+        <source>Device discovery error: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/>
+        <source>Not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/>
+        <source>The local Bluetooth adapter cannot be accessed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="495"/>
+        <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="595"/>
         <source>Person: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="596"/>
         <source>Searches for buddies and divemasters</source>
         <translation type="unfinished"/>
     </message>
@@ -16,7 +271,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
+        <location filename="../qt-models/filtermodels.cpp" line="233"/>
         <source>No buddies</source>
         <translation type="unfinished"/>
     </message>
@@ -24,180 +279,205 @@
 <context>
     <name>ColumnNameProvider</name>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="42"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="212"/>
+        <location filename="../configuredivecomputer.cpp" line="220"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="228"/>
+        <location filename="../configuredivecomputer.cpp" line="236"/>
         <source>Could not open backup file: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="552"/>
+        <location filename="../configuredivecomputer.cpp" line="584"/>
         <source>Dive computer details read successfully</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="561"/>
+        <location filename="../configuredivecomputer.cpp" line="593"/>
         <source>Setting successfully written to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="570"/>
+        <location filename="../configuredivecomputer.cpp" line="602"/>
         <source>Device firmware successfully updated</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="579"/>
+        <location filename="../configuredivecomputer.cpp" line="611"/>
         <source>Device settings successfully reset</source>
         <translation type="unfinished"/>
     </message>
@@ -206,922 +486,1212 @@
     <name>ConfigureDiveComputerDialog</name>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1518"/>
         <source>Configure dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1519"/>
         <source>Device or mount point</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="141"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/>
         <source>Retrieve available details</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1530"/>
         <source>Restore backup</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1531"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="148"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="171"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="185"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
         <source>OSTC 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="210"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1242"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="224"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1376"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1752"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1616"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1764"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1781"/>
         <source>Basic settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="216"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1471"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1768"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="239"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1360"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="291"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1494"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1791"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="256"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1394"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="308"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1528"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1808"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
         <source>Language</source>
         <translation>שפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="290"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="231"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1552"/>
         <source>English</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="236"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1553"/>
         <source>German</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="241"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1554"/>
         <source>French</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="246"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1555"/>
         <source>Italian</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="324"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="342"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
         <source>OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="329"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
         <source>CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="334"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1930"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="352"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2035"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="339"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="357"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
         <source>Apnea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1802"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1936"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
         <source>Date format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
         <source>MMDDYY</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="363"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="381"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
         <source>DDMMYY</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="368"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="386"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
         <source>YYMMDD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="841"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2022"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="883"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2156"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="439"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="688"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="740"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="806"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="825"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1131"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1843"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1905"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1973"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1999"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2032"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="453"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="690"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="716"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="768"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="834"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="860"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="942"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="958"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1265"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1977"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2081"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2107"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2133"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2173"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2196"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="678"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1833"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="706"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1960"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="796"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="824"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2097"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="717"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1872"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="745"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2006"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="376"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="423"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
         <source>Brightness</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="387"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
         <source>Eco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="392"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="410"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
         <source>Medium</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="397"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
         <source>High</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="522"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="540"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1926"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="533"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="464"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
         <source>2s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="469"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1584"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1531"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="433"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1665"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="416"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
         <source>m/°C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="421"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
         <source>ft/°F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="546"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="581"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
         <source>Dive mode color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="551"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1608"/>
         <source>Standard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1609"/>
         <source>Red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1610"/>
         <source>Green</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1611"/>
         <source>Blue</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="429"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
         <source>Salinity (0-5%)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1726"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="574"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1860"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1770"/>
         <source>Sync dive computer time with PC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="449"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="608"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
         <source>Compass gain</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="90"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="189"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="203"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
         <source>OSTC, Mk.2/2N/2C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="484"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
         <source>230LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="471"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="489"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
         <source>330LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="476"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="494"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
         <source>390LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="481"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="499"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
         <source>440LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="486"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="504"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
         <source>660LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="491"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="509"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
         <source>820LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="496"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="514"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
         <source>1090LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="519"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
         <source>1370LSB/Gauss</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="591"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1867"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="597"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="601"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
         <source>Reset device to default settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1953"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1617"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1782"/>
         <source>Alt GF can be selected underwater</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="194"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
         <source>Suunto Vyper family</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="619"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1947"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="618"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="646"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1970"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1783"/>
         <source>Future TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="653"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1619"/>
         <source>Pressure sensor offset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2071"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="660"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2189"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1620"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1809"/>
         <source>GFLow</source>
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="655"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2064"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="683"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2166"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1622"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1808"/>
         <source>GFHigh</source>
         <translation>גרדיאנט עליון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2019"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1787"/>
         <source>Decotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="784"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1629"/>
         <source> mbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="814"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2068"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="783"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="801"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2030"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1792"/>
         <source>ZH-L16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/>
+        <source>Left button sensitivity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/>
+        <source>Always show ppO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="850"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2123"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1802"/>
         <source>Alt GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="876"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2149"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1641"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1804"/>
         <source>Alt GFHigh</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/>
-        <source>Gas settings</source>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="900"/>
+        <source>Right button sensitivity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1006"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2127"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="914"/>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/>
+        <source>Graphical speed indicator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="928"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2251"/>
+        <source>Bottom gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="935"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2258"/>
+        <source>Deco gas consumption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1007"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2266"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1721"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1876"/>
+        <source>Gas settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1140"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2314"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2399"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1647"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1670"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1814"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1837"/>
         <source>%He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1011"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2132"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2217"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1060"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1145"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2319"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2404"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1649"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1672"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1816"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1839"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="931"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1016"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2137"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2222"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1150"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2324"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2409"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1651"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1674"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1818"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1841"/>
         <source>Change depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2142"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1070"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2329"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1656"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1823"/>
         <source>Gas 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="941"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2147"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1075"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2334"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1658"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1825"/>
         <source>Gas 2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="946"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1080"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1660"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1827"/>
         <source>Gas 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="951"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2157"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1085"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2344"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1662"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1829"/>
         <source>Gas 4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="956"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1090"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2349"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1664"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1831"/>
         <source>Gas 5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2227"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1155"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2414"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1679"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1846"/>
         <source>Dil 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1026"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1160"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2419"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1681"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1848"/>
         <source>Dil 2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1031"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2237"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1165"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2424"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1683"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1850"/>
         <source>Dil 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1170"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2429"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1685"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1852"/>
         <source>Dil 4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1041"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1175"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1687"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1854"/>
         <source>Dil 5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1086"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2282"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1220"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2469"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="1091"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1225"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2474"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="1096"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2292"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1230"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2479"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1865"/>
         <source>SP 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2297"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2484"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1700"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1867"/>
         <source>SP 2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1106"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2302"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1240"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2489"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1702"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1869"/>
         <source>SP 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1111"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1245"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1704"/>
         <source>SP 4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1116"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1250"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1706"/>
         <source>SP 5</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1282"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1287"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1714"/>
         <source>Sensor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1295"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1716"/>
         <source>Setpoint fallback</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1200"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1318"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1334"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2510"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2526"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1717"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1718"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1872"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1873"/>
         <source> cbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1563"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1568"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1607"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
         <source>Total dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1831"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
         <source>kg/ℓ</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2045"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
         <source>Apnoea</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
         <source>Safety level</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1001"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="907"/>
+        <source>MOD warning</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="974"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="990"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2219"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2235"/>
+        <source> ℓ/min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1135"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2309"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2394"/>
+        <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="../qt-ui/configuredivecomputerdialog.ui" line="1124"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1258"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
         <source>O₂ in calibration gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1350"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2542"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1874"/>
         <source>pO₂ max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1357"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2549"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1720"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1875"/>
         <source>pO₂ min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1431"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1724"/>
         <source>Model</source>
         <translation>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1451"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1893"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1725"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1778"/>
         <source>Number of dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1728"/>
         <source>Max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1558"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1732"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1576"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1589"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1740"/>
         <source>20s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1594"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1741"/>
         <source>30s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1742"/>
         <source>60s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
         <source>Computer model</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1589"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1631"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1723"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1746"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1762"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1749"/>
         <source>24h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1650"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1750"/>
         <source>12h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1658"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1752"/>
         <source>Time format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1673"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1756"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1544"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1678"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1757"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1689"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1759"/>
         <source>s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1696"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1760"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1761"/>
         <source>Depth alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1763"/>
         <source>Time alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1758"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
         <source>Salinity</source>
         <translation>מליחות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1875"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1880"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1775"/>
         <source>DD/MM/YY</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1776"/>
         <source>YY/MM/DD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2040"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2050"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2055"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1797"/>
         <source>L16-GF CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2060"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1798"/>
         <source>PSCR-GF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1050"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1077"/>
         <source>Backup files (*.xml)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1034"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1061"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Backup succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1038"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
         <source>Your settings have been saved to: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
         <source>Backup dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1033"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1060"/>
         <source>XML backup error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1049"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1076"/>
         <source>Restore dive computer settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1080"/>
         <source>XML restore error</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1060"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1087"/>
         <source>Restore succeeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1061"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1088"/>
         <source>Your settings have been restored successfully.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1071"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1098"/>
         <source>Select firmware file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1072"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1099"/>
         <source>All files (*.*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1160"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1161"/>
+        <source>Log files (*.log)</source>
+        <translation>קבצי יומן (*.log)</translation>
+    </message>
 </context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Size</source>
         <translation>גודל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Work press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Start press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>End press.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>O₂%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="79"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="15"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="79"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="15"/>
         <source>Use</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="191"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="410"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
         <source>Cylinder cannot be removed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="411"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation type="unfinished"/>
     </message>
@@ -1130,66 +1700,73 @@
     <name>DiveComponentSelectionDialog</name>
     <message>
         <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <location filename="../build/ui_divecomponentselection.h" line="139"/>
         <source>Component selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="52"/>
+        <location filename="../build/ui_divecomponentselection.h" line="140"/>
         <source>Which components would you like to copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="80"/>
+        <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
-        <source>GPS coordinates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="87"/>
+        <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="94"/>
+        <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="101"/>
+        <location filename="../build/ui_divecomponentselection.h" line="145"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="108"/>
+        <location filename="../build/ui_divecomponentselection.h" line="146"/>
         <source>Weights</source>
         <translation>משקולות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="115"/>
+        <location filename="../build/ui_divecomponentselection.h" line="147"/>
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
@@ -1197,18 +1774,19 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>האם אתם בטוחים שברצונכם להסיר את המחשב הנבחר?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
         <source>Edit dive computer nicknames</source>
         <translation type="unfinished"/>
     </message>
@@ -1216,22 +1794,22 @@
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1616"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Model</source>
         <translation>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1616"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Device ID</source>
         <translation>מזהה התקן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1616"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Nickname</source>
         <translation>כינוי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1652"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="41"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -1239,18 +1817,18 @@
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
-        <source>Bailing out to OC</source>
-        <translation>מעבר חרום למערכת נשימה פתוחה</translation>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="116"/>
+        <source>Manual switch to OC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation>להתחיל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="119"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation>סוף</translation>
@@ -1259,27 +1837,27 @@
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="562"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="652"/>
         <source>Date/time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="564"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="654"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="566"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="656"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/>
         <source>h:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
@@ -1287,97 +1865,97 @@
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1272"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
@@ -1385,87 +1963,92 @@
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="837"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
+        <location filename="../qt-ui/divelistview.cpp" line="839"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="770"/>
+        <location filename="../qt-ui/divelistview.cpp" line="843"/>
         <source>Collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="772"/>
+        <location filename="../qt-ui/divelistview.cpp" line="847"/>
         <source>Remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="773"/>
+        <location filename="../qt-ui/divelistview.cpp" line="848"/>
         <source>Create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="862"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="864"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="793"/>
+        <location filename="../qt-ui/divelistview.cpp" line="868"/>
         <source>Merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="794"/>
+        <location filename="../qt-ui/divelistview.cpp" line="869"/>
         <source>Merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="798"/>
+        <location filename="../qt-ui/divelistview.cpp" line="873"/>
         <source>Delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="800"/>
+        <location filename="../qt-ui/divelistview.cpp" line="875"/>
         <source>Mark dive(s) invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="804"/>
+        <location filename="../qt-ui/divelistview.cpp" line="879"/>
         <source>Merge selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="881"/>
         <source>Renumber dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="807"/>
-        <source>Shift times</source>
+        <location filename="../qt-ui/divelistview.cpp" line="882"/>
+        <source>Shift dive times</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="883"/>
+        <source>Load image(s) from file(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
-        <source>Load images</source>
+        <location filename="../qt-ui/divelistview.cpp" line="884"/>
+        <source>Load image(s) from web</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="831"/>
+        <location filename="../qt-ui/divelistview.cpp" line="907"/>
         <source>Open image files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="831"/>
+        <location filename="../qt-ui/divelistview.cpp" line="907"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -1473,277 +2056,330 @@
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
         <source>Export format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="88"/>
-        <source>Subsurface XML</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
         <source>UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="120"/>
-        <source>divelogs.de</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+        <source>Worldmap</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="160"/>
-        <source>Worldmap</source>
+        <location filename="../qt-ui/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="../qt-ui/divelogexportdialog.ui" line="210"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="243"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
         <source>Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="219"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <location filename="../qt-ui/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 type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="262"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
         <source>All dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="277"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
         <source>HTML</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/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="../qt-ui/divelogexportdialog.ui" line="29"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="44"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
         <source>General export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="130"/>
-        <source>DiveShare</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="115"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
+        <source>Subsurface &amp;XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="140"/>
-        <source>CSV dive profile</source>
+        <location filename="../qt-ui/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="../qt-ui/divelogexportdialog.ui" line="150"/>
-        <source>CSV dive details</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="157"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="355"/>
+        <source>DiveShare</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="167"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
+        <source>CSV dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="170"/>
-        <source>Image depths</source>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="177"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
+        <source>CSV dive details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="261"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="288"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="266"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="293"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="283"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="324"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="289"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="330"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="318"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="359"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="375"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="374"/>
+        <source>All di&amp;ves</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="385"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="357"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="392"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="376"/>
+        <source>Export photos</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="408"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="369"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="423"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="379"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="433"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="390"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="444"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="395"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="449"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="400"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="454"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="405"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="459"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="410"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="464"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="415"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="469"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="420"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="474"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="428"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="482"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="439"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="493"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="393"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="95"/>
         <source>Light</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="444"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="498"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="149"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF קבצי (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="157"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <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="../qt-ui/divelogexportdialog.cpp" line="74"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
         <source>Subsurface native XML format.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
         <source>Write depths of images to file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="148"/>
         <source>Export UDDF file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="152"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="156"/>
         <source>Export CSV file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
         <source>Export world map</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="164"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="184"/>
         <source>HTML files (*.html)</source>
         <translation>קבצי HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
         <source>Export Subsurface XML</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="169"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
         <source>Save image depths</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="183"/>
         <source>Export HTML files as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="199"/>
+        <source>Please wait, exporting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="234"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
@@ -1752,236 +2388,300 @@
     <name>DiveLogImportDialog</name>
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="149"/>
         <source>Import dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="780"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="89"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="94"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="153"/>
         <source>mm/dd/yyyy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="99"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="154"/>
         <source>yyyy-mm-dd</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <location filename="../qt-ui/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="../qt-ui/divelogimportdialog.cpp" line="576"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="776"/>
         <source>Dive #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="778"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="782"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="786"/>
         <source>GPS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="788"/>
+        <source>Max. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="790"/>
+        <source>Avg. depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="796"/>
+        <source>Suit</source>
+        <translation>חליפה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="609"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="802"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="598"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="818"/>
         <source>O₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="820"/>
         <source>He</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="108"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
         <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="113"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
         <source>Minutes</source>
         <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="118"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
         <source>Minutes:seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="784"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
-        <source>Max depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="469"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
         <source>Tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="521"/>
         <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="../qt-ui/divelogimportdialog.cpp" line="473"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="662"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="713"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="772"/>
         <source>Sample time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="664"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="715"/>
         <source>Sample depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="666"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="717"/>
         <source>Sample temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="670"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="721"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="569"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="672"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="723"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="571"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="674"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="725"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="682"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="733"/>
         <source>Sample stopdepth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="686"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="668"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="719"/>
         <source>Sample pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="573"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="676"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="727"/>
         <source>Sample CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="575"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="678"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="729"/>
         <source>Sample NDL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="680"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="731"/>
         <source>Sample TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="684"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="735"/>
         <source>Sample pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
-        <source>Mean depth</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="792"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="794"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+        <source>Rating</source>
+        <translation>דירוג</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+        <source>Visibility</source>
+        <translation>ראות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="798"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="608"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="800"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="812"/>
         <source>Cyl. size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="596"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="814"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="597"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="816"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="822"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="824"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
@@ -1990,36 +2690,43 @@
     <name>DivePlanner</name>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
         <source>Altitude</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="109"/>
+        <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="159"/>
+        <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="166"/>
+        <location filename="../build/ui_diveplanner.h" line="192"/>
         <source>Salinity</source>
         <translation>מליחות</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="179"/>
+        <location filename="../build/ui_diveplanner.h" line="193"/>
         <source>mbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="198"/>
+        <location filename="../build/ui_diveplanner.h" line="194"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="220"/>
+        <location filename="../build/ui_diveplanner.h" line="195"/>
         <source> kg/ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -2027,65 +2734,55 @@
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="124"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="297"/>
         <source>Final depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="299"/>
         <source>Run time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="301"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="303"/>
         <source>Used gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="305"/>
         <source>CC set point</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
-        <source>Discard the plan?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
-        <source>You are about to discard your plan.</source>
-        <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation>
-    </message>
 </context>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="104"/>
         <source>Dive planner points</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="108"/>
         <source>Available gases</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="133"/>
         <source>Add dive data point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="142"/>
         <source>Save new</source>
         <translation type="unfinished"/>
     </message>
@@ -2093,112 +2790,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="112"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
         <source>Pressure</source>
         <translation>לחץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
         <source>Color</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Pressure S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pHe</source>
         <translation>לחץ הליום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
         <source>Setpoint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Sensor 1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
         <source>Sensor 2</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
         <source>Sensor 3</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Mean depth @ s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
         <source>Ambient pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Gradient factor</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure I</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
         <source>User entered</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>Cylinder index</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
@@ -2207,169 +2904,187 @@
     <name>DiveShareExportDialog</name>
     <message>
         <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="176"/>
         <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="34"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="61"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="177"/>
         <source>User ID</source>
         <translation>זיהוי משתמש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="75"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="181"/>
         <source>⌫</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="82"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="182"/>
         <source>Get user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="91"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="183"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt; Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="104"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="185"/>
         <source>Private dives will not appear in &quot;related dives&quot; lists, and will only be accessible if their URL is known.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="107"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="187"/>
         <source>Keep dives private</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="129"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="188"/>
         <source>Upload dive data</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="174"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="189"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Oxygen-Sans'; font-size:7pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
         <source>Temp</source>
         <translation>טמפ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
         <source>SAC</source>
         <translation>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
         <source>Weight(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
-        <location filename="../qt-ui/models.cpp" line="1513"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
         <source>Cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1516"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
         <source>SAC(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
-        <location filename="../qt-ui/models.cpp" line="1527"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
         <source>Max CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1530"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>Depth(%1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
         <source>Temp(%1%2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2377,95 +3092,96 @@
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="152"/>
         <source>no dives were selected</source>
         <translation>שום צלילות נבחרו</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>failed to create zip file for upload: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
-        <source>cannot create temporary file: %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
-        <source>internal error: %s</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="224"/>
         <source>internal error</source>
         <translation>שגיאה פנימית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="711"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="901"/>
         <source>Done</source>
         <translation>סיים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="744"/>
         <source>Uploading dive list...</source>
         <translation>העלאת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="776"/>
         <source>Downloading dive list...</source>
         <translation>הורדת רשימת צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
         <source>Downloading %1 dives...</source>
         <translation>הורדת 1% צלילות...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Download finished - %1</source>
         <translation>ההורדה הסתיימה - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <source>Problem with download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <source>The archive could not be opened:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="875"/>
         <source>Corrupted download</source>
         <translation>הורדה פגומה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>לא היה אפשרות לפתוח את הארכיון:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="915"/>
         <source>Upload failed</source>
         <translation>ההעלאה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="918"/>
         <source>Upload successful</source>
         <translation>ההעלאה הסתיימה בהצלחה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="921"/>
         <source>Login failed</source>
         <translation>שגיאת התחברות (הזדהות)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="924"/>
         <source>Cannot parse response</source>
         <translation>תשובה לא ברורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/>
         <source>Error: %1</source>
         <translation>שגיאה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="902"/>
         <source>Upload finished</source>
         <translation>ההעלאה הסתיימה</translation>
     </message>
@@ -2473,52 +3189,57 @@
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="185"/>
         <source>Error</source>
         <translation>שגיאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="444"/>
         <source>Retry</source>
         <translation>נסה שוב</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="280"/>
         <source>Find Uemis dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="101"/>
         <source>Download</source>
         <translation>הורדה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="104"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="390"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="391"/>
         <source>Log files (*.log)</source>
         <translation>קבצי יומן (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="406"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="407"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="418"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="419"/>
         <source>Dump files (*.bin)</source>
         <translation>קבצי Dump (*.bin)</translation>
     </message>
@@ -2526,84 +3247,113 @@
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
         <source>Vendor</source>
         <translation>יצרן</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="266"/>
         <source>Device or mount point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
         <source>Dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="115"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="267"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="272"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="274"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="268"/>
         <source>Force download of all dives</source>
         <translation>משוך את כל הצלילות.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="269"/>
         <source>Always prefer downloaded dives</source>
         <translation>תמיד העדף צלילות מורדות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="129"/>
+        <source>Select a remote Bluetooth device.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
         <source>Download</source>
         <translation>הורדה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
         <source>OK</source>
         <translation>אשר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="226"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="236"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="279"/>
         <source>Select all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="243"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="280"/>
         <source>Unselect all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
         <source>Save libdivecomputer logfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
         <source>Download into new trip</source>
         <translation type="unfinished"/>
     </message>
@@ -2611,12 +3361,12 @@
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2286"/>
+        <location filename="../qt-models/divecomputerextradatamodel.cpp" line="10"/>
         <source>Key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2286"/>
+        <location filename="../qt-models/divecomputerextradatamodel.cpp" line="10"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
@@ -2624,22 +3374,22 @@
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="259"/>
         <source>Photo upload sucessfull</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="246"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="260"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="264"/>
         <source>Photo upload failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="251"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="265"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -2650,16 +3400,19 @@
     <name>FilterWidget</name>
     <message>
         <location filename="../qt-ui/listfilter.ui" line="14"/>
+        <location filename="../build/ui_listfilter.h" line="74"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="22"/>
+        <location filename="../qt-ui/listfilter.ui" line="40"/>
+        <location filename="../build/ui_listfilter.h" line="75"/>
         <source>Text label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="32"/>
+        <location filename="../qt-ui/listfilter.ui" line="50"/>
+        <location filename="../build/ui_listfilter.h" line="76"/>
         <source>Filter this list</source>
         <translation type="unfinished"/>
     </message>
@@ -2668,16 +3421,19 @@
     <name>FilterWidget2</name>
     <message>
         <location filename="../qt-ui/filterwidget.ui" line="73"/>
+        <location filename="../build/ui_filterwidget.h" line="118"/>
         <source>Reset filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/filterwidget.ui" line="87"/>
+        <location filename="../build/ui_filterwidget.h" line="121"/>
         <source>Show/hide filters</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/filterwidget.ui" line="101"/>
+        <location filename="../build/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation type="unfinished"/>
     </message>
@@ -2685,17 +3441,22 @@
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1623"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1749"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1784"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1626"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1786"/>
         <source>Firmware update failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1629"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1789"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -2703,376 +3464,591 @@
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="119"/>
+        <location filename="../qt-ui/globe.cpp" line="124"/>
         <source>Edit selected dive locations</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>KMessageWidget</name>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="90"/>
+        <source>&amp;Close</source>
+        <translation>&amp;סגור</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="91"/>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="622"/>
         <source>Location: </source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>LocationFilterDelegate</name>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="540"/>
+        <source> (same GPS fix)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="545"/>
+        <source> (~%1 away</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../qt-ui/modeldelegates.cpp" line="546"/>
+        <source>, %n dive(s) here)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="551"/>
+        <source>(no existing GPS data, add GPS fix from this dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="553"/>
+        <source>(no GPS data)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="555"/>
+        <source>Pick site: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
+        <location filename="../qt-models/filtermodels.cpp" line="286"/>
         <source>No location set</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>MainTab</name>
+    <name>LocationInformation</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="160"/>
-        <location filename="../qt-ui/maintab.cpp" line="498"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
+        <location filename="../qt-ui/locationInformation.ui" line="14"/>
+        <location filename="../build/ui_locationInformation.h" line="111"/>
+        <source>GroupBox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="29"/>
+        <location filename="../build/ui_locationInformation.h" line="113"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="65"/>
+        <location filename="../qt-ui/locationInformation.ui" line="36"/>
+        <location filename="../build/ui_locationInformation.h" line="115"/>
+        <source>Description</source>
+        <translation>תיאור</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="43"/>
+        <location filename="../build/ui_locationInformation.h" line="116"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="53"/>
+        <location filename="../build/ui_locationInformation.h" line="114"/>
         <source>Coordinates</source>
         <translation>קואורדינטות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="167"/>
+        <location filename="../qt-ui/locationInformation.ui" line="69"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="90"/>
+        <source>Dive sites on same coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_locationInformation.h" line="112"/>
+        <source>Dive Site</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocationInformationModel</name>
+    <message>
+        <location filename="../qt-models/divelocationmodel.cpp" line="67"/>
+        <source>Create dive site with this name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocationInformationWidget</name>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="22"/>
+        <source>Apply changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="25"/>
+        <source>Discard changes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="28"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="209"/>
+        <source>Dive site management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="61"/>
+        <source>Merge dive Sites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="70"/>
+        <source>Merging dive sites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="71"/>
+        <source>You are about to merge dive sites, you can't undo that action 
+ Are you sure you want to continue?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <source>You are editing a dive site</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainTab</name>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../build/ui_maintab.h" line="951"/>
+        <location filename="../qt-ui/maintab.cpp" line="642"/>
+        <source>Location</source>
+        <translation>מיקום</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="249"/>
+        <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="174"/>
+        <location filename="../qt-ui/maintab.ui" line="259"/>
+        <location filename="../build/ui_maintab.h" line="955"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
+        <location filename="../qt-ui/maintab.ui" line="305"/>
+        <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="219"/>
+        <location filename="../qt-ui/maintab.ui" line="318"/>
+        <location filename="../build/ui_maintab.h" line="957"/>
         <source>Visibility</source>
         <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="228"/>
+        <location filename="../qt-ui/maintab.ui" line="325"/>
+        <location filename="../build/ui_maintab.h" line="958"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="471"/>
-        <source>Dive notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.ui" line="394"/>
+        <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="100"/>
-        <location filename="../qt-ui/maintab.ui" line="675"/>
-        <location filename="../qt-ui/maintab.cpp" line="280"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.ui" line="866"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="107"/>
-        <location filename="../qt-ui/maintab.ui" line="694"/>
-        <location filename="../qt-ui/maintab.cpp" line="281"/>
+        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="885"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="366"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="282"/>
-        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../qt-ui/maintab.cpp" line="617"/>
+        <location filename="../qt-ui/maintab.cpp" line="643"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="396"/>
+        <location filename="../qt-ui/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="../qt-ui/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="521"/>
+        <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
         <translation>ציוד</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="524"/>
+        <location filename="../build/ui_maintab.h" line="966"/>
+        <source>Used equipment in the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="616"/>
+        <location filename="../build/ui_maintab.h" line="994"/>
+        <source>Info</source>
+        <translation>פרטים</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="619"/>
+        <location filename="../build/ui_maintab.h" line="995"/>
+        <source>Dive information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="714"/>
+        <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../build/ui_maintab.h" line="973"/>
         <source>Gas consumed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
+        <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="809"/>
+        <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="656"/>
+        <location filename="../qt-ui/maintab.ui" line="847"/>
+        <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="713"/>
+        <location filename="../qt-ui/maintab.ui" line="904"/>
+        <location filename="../build/ui_maintab.h" line="991"/>
         <source>Dive time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="872"/>
+        <location filename="../qt-ui/maintab.ui" line="963"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="1069"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="930"/>
+        <location filename="../qt-ui/maintab.ui" line="1136"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
         <source>Gas consumption</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="989"/>
+        <location filename="../qt-ui/maintab.ui" line="1181"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="1207"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
         <source>Extra data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="995"/>
-        <source>Additional data from dive computer</source>
+        <location filename="../qt-ui/maintab.ui" line="1210"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="81"/>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="92"/>
+        <location filename="../qt-ui/maintab.ui" line="676"/>
+        <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="../qt-ui/maintab.ui" line="88"/>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
-        <source>Dive info</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="695"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
         <source>Interval</source>
         <translation>משך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
-        <location filename="../qt-ui/maintab.ui" line="826"/>
+        <location filename="../qt-ui/maintab.ui" line="752"/>
+        <location filename="../qt-ui/maintab.ui" line="1124"/>
+        <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="../qt-ui/maintab.ui" line="637"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
         <source>Avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="790"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="732"/>
+        <location filename="../qt-ui/maintab.ui" line="923"/>
+        <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
         <translation>מליחות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="769"/>
+        <location filename="../qt-ui/maintab.ui" line="960"/>
+        <location filename="../build/ui_maintab.h" line="1006"/>
         <source>Stats</source>
         <translation>סטטסטיקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="802"/>
+        <location filename="../qt-ui/maintab.ui" line="1016"/>
+        <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="814"/>
+        <location filename="../qt-ui/maintab.ui" line="1057"/>
+        <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="840"/>
+        <location filename="../qt-ui/maintab.ui" line="1028"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="891"/>
+        <location filename="../qt-ui/maintab.ui" line="1088"/>
+        <location filename="../build/ui_maintab.h" line="1001"/>
         <source>Dives</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="975"/>
+        <location filename="../qt-ui/maintab.ui" line="1178"/>
+        <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="87"/>
+        <location filename="../qt-ui/maintab.cpp" line="107"/>
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="91"/>
+        <location filename="../qt-ui/maintab.cpp" line="111"/>
         <source>Weights</source>
         <translation>משקולות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Apply changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="50"/>
+        <location filename="../qt-ui/maintab.cpp" line="86"/>
         <source>Discard changes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="88"/>
+        <location filename="../qt-ui/maintab.cpp" line="108"/>
         <source>Add cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="92"/>
+        <location filename="../qt-ui/maintab.cpp" line="112"/>
         <source>Add weight system</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Air temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.cpp" line="363"/>
         <source>Water temp. [%1]</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="315"/>
+        <location filename="../qt-ui/maintab.cpp" line="400"/>
         <source>This trip is being edited.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="323"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>Multiple dives are being edited.</source>
         <translation>צלילות מרובות בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="325"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>This dive is being edited.</source>
         <translation>צלילה זו בעריכה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="440"/>
-        <location filename="../qt-ui/maintab.cpp" line="466"/>
+        <location filename="../qt-ui/maintab.cpp" line="587"/>
+        <location filename="../qt-ui/maintab.cpp" line="612"/>
         <source>Trip notes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="464"/>
+        <location filename="../qt-ui/maintab.cpp" line="609"/>
         <source>Trip location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="535"/>
-        <location filename="../qt-ui/maintab.cpp" line="567"/>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
-        <location filename="../qt-ui/maintab.cpp" line="575"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
+        <location filename="../qt-ui/maintab.cpp" line="712"/>
+        <location filename="../qt-ui/maintab.cpp" line="716"/>
+        <location filename="../qt-ui/maintab.cpp" line="720"/>
         <source>/min</source>
         <translation>לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="564"/>
+        <location filename="../qt-ui/maintab.cpp" line="709"/>
         <source>Deepest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="565"/>
+        <location filename="../qt-ui/maintab.cpp" line="710"/>
         <source>Shallowest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="578"/>
+        <location filename="../qt-ui/maintab.cpp" line="723"/>
         <source>Highest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="579"/>
+        <location filename="../qt-ui/maintab.cpp" line="724"/>
         <source>Lowest total SAC of a dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="580"/>
+        <location filename="../qt-ui/maintab.cpp" line="725"/>
         <source>Average total SAC of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="591"/>
+        <location filename="../qt-ui/maintab.cpp" line="736"/>
         <source>Highest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="592"/>
+        <location filename="../qt-ui/maintab.cpp" line="737"/>
         <source>Lowest temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="593"/>
+        <location filename="../qt-ui/maintab.cpp" line="738"/>
         <source>Average temperature of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="603"/>
+        <location filename="../qt-ui/maintab.cpp" line="748"/>
         <source>Longest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="604"/>
+        <location filename="../qt-ui/maintab.cpp" line="749"/>
         <source>Shortest dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="605"/>
+        <location filename="../qt-ui/maintab.cpp" line="750"/>
         <source>Average length of all selected dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="629"/>
+        <location filename="../qt-ui/maintab.cpp" line="774"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="633"/>
+        <location filename="../qt-ui/maintab.cpp" line="778"/>
         <source> and </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="926"/>
+        <location filename="../qt-ui/maintab.cpp" line="1229"/>
         <source>Discard the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="927"/>
+        <location filename="../qt-ui/maintab.cpp" line="1230"/>
         <source>You are about to discard your changes.</source>
         <translation type="unfinished"/>
     </message>
@@ -3080,593 +4056,791 @@ mixed from Air and using:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="70"/>
+        <location filename="../build/ui_mainwindow.h" line="568"/>
         <source>&amp;File</source>
         <translation>&amp;קובץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="574"/>
+        <location filename="../qt-ui/mainwindow.ui" line="455"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
         <source>Export dive logs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
         <source>Toggle pHe graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="665"/>
+        <location filename="../qt-ui/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="../qt-ui/mainwindow.ui" line="641"/>
+        <location filename="../qt-ui/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="../qt-ui/mainwindow.ui" line="653"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
         <source>Toggle calculated ceiling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="725"/>
+        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
         <source>Toggle NDL, TTS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/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="../qt-ui/mainwindow.ui" line="582"/>
+        <location filename="../qt-ui/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="../qt-ui/mainwindow.ui" line="593"/>
-        <source>Re-plan &amp;dive</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <location filename="../qt-ui/mainwindow.ui" line="570"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
         <source>Toggle heart rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="701"/>
+        <location filename="../qt-ui/mainwindow.ui" line="582"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
         <source>Toggle MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="713"/>
+        <location filename="../qt-ui/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="../qt-ui/mainwindow.ui" line="737"/>
+        <location filename="../qt-ui/mainwindow.ui" line="618"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
         <source>Toggle SAC rate</source>
         <translation>צריכת אויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="749"/>
+        <location filename="../qt-ui/mainwindow.ui" line="630"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
         <source>Toggle ruler</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="124"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="140"/>
-        <source>Print</source>
-        <translation>הדפס</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="173"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="95"/>
+        <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;עזרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="137"/>
+        <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;ייבא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="282"/>
+        <location filename="../qt-ui/mainwindow.ui" line="146"/>
+        <location filename="../build/ui_mainwindow.h" line="573"/>
+        <source>&amp;Edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>יומן &amp;חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
+        <location filename="../qt-ui/mainwindow.ui" line="161"/>
+        <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>&amp;לפתוח יומן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
+        <location filename="../qt-ui/mainwindow.ui" line="172"/>
+        <location filename="../build/ui_mainwindow.h" line="460"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="339"/>
         <source>Open</source>
         <translation>פתח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="175"/>
+        <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="304"/>
+        <location filename="../qt-ui/mainwindow.ui" line="180"/>
+        <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>&amp;שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="315"/>
+        <location filename="../qt-ui/mainwindow.ui" line="191"/>
+        <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="194"/>
+        <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>שמור בשם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="202"/>
+        <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>&amp;סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="205"/>
+        <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
+        <location filename="../qt-ui/mainwindow.ui" line="208"/>
+        <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
+        <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <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="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../build/ui_mainwindow.h" line="488"/>
+        <source>Edit device &amp;names</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../build/ui_mainwindow.h" line="491"/>
+        <source>&amp;Edit dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="285"/>
+        <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="460"/>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="476"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="484"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
+        <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="500"/>
+        <location filename="../qt-ui/mainwindow.ui" line="381"/>
+        <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="522"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="527"/>
+        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="535"/>
+        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="538"/>
+        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="577"/>
+        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="585"/>
+        <location filename="../qt-ui/mainwindow.ui" line="466"/>
+        <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="605"/>
+        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../build/ui_mainwindow.h" line="539"/>
+        <source>Edit &amp;dive in planner</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="617"/>
+        <location filename="../qt-ui/mainwindow.ui" line="498"/>
+        <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="773"/>
+        <location filename="../qt-ui/mainwindow.ui" line="654"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="808"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
         <source>Toggle tissue graph</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <location filename="../qt-ui/mainwindow.ui" line="699"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="213"/>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="702"/>
+        <location filename="../build/ui_mainwindow.h" line="561"/>
+        <source>Ctrl+Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="707"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="214"/>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="710"/>
+        <location filename="../build/ui_mainwindow.h" line="563"/>
+        <source>Ctrl+Shift+Z</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="715"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="720"/>
+        <source>Open c&amp;loud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="725"/>
+        <source>Save to clo&amp;ud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="730"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="735"/>
+        <source>Dive Site &amp;Edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
+        <location filename="../qt-ui/mainwindow.ui" line="213"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
         <source>&amp;Print</source>
         <translation>&amp;הדפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="348"/>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="356"/>
+        <location filename="../qt-ui/mainwindow.ui" line="232"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
         <source>&amp;Quit</source>
         <translation>&amp;צא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="243"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
         <source>Import from &amp;dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
         <source>&amp;Renumber</source>
         <translation>&amp;מספר מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="312"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="511"/>
+        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="340"/>
+        <location filename="../qt-ui/mainwindow.ui" line="216"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="359"/>
+        <location filename="../qt-ui/mainwindow.ui" line="235"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="246"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="383"/>
-        <source>&amp;Edit device names</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="388"/>
+        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
         <source>&amp;Add dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="304"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
         <source>Auto &amp;group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
         <source>&amp;Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
         <source>&amp;Dive list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="320"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="328"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="455"/>
+        <location filename="../qt-ui/mainwindow.ui" line="336"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="463"/>
+        <location filename="../qt-ui/mainwindow.ui" line="344"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="468"/>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
         <source>P&amp;revious DC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="471"/>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
         <source>Left</source>
         <translation>שמאל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="479"/>
+        <location filename="../qt-ui/mainwindow.ui" line="360"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
         <source>Right</source>
         <translation>ימין</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="492"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
         <source>User &amp;manual</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="495"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="503"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="508"/>
+        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
         <source>P&amp;lan dive</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="516"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
         <source>&amp;Import log files</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="519"/>
+        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
         <source>Import divelog files from other applications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="541"/>
+        <location filename="../qt-ui/mainwindow.ui" line="422"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
         <source>F11</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="230"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="336"/>
         <source>Open file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="234"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="340"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="445"/>
         <source>Cancel</source>
         <translation>בטל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="308"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="441"/>
+        <source>Traverse image directories</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
+        <source>Scan</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="452"/>
+        <source>Scanning images...(this can take a while)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="505"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="420"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="622"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני שאתה מנסה להוסיף צלילה.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="669"/>
         <source>Print runtime table</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="810"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="774"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1032"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="812"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1035"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="817"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1040"/>
         <source>Save changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1172"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1395"/>
         <source>Save file as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1313"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1473"/>
+        <source>[cloud storage for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1570"/>
+        <source>Opening datafile from older version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1571"/>
+        <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="../qt-ui/mainwindow.cpp" line="1582"/>
         <source>Open dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1583"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;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);;All files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1041"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="278"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="420"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1354"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="480"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="622"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="768"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="774"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1628"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="224"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1156"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="375"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1377"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="601"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="821"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1396"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
-        <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
+        <location filename="../qt-ui/mainwindow.cpp" line="768"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1628"/>
+        <source>Please, first finish the current edition before trying to do another.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1354"/>
-        <source>Please, first finish the current edition before trying to do another.</source>
+        <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="../qt-ui/simplewidgets.cpp" line="634"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="707"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation type="unfinished"/>
     </message>
@@ -3674,39 +4848,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <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="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
         <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="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="249"/>
         <source>Not now</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
         <source>Update firmware</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="252"/>
         <source>Firmware upgrade notice</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="270"/>
         <source>Save the downloaded firmware as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="271"/>
         <source>HEX files (*.hex)</source>
         <translation type="unfinished"/>
     </message>
@@ -3714,69 +4888,69 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="319"/>
         <source>Open circuit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="319"/>
         <source>CCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="319"/>
         <source>pSCR</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="418"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="419"/>
         <source>Last stop at 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
         <source>50% avg. depth to 20ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
         <source>20ft to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="423"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
         <source>50% avg. depth to 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="426"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="429"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="430"/>
         <source>cuft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="438"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="439"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
@@ -3784,443 +4958,680 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="97"/>
+        <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>ברירות מחדל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="107"/>
+        <location filename="../build/ui_preferences.h" line="1290"/>
         <source>Units</source>
         <translation>יחידות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="117"/>
+        <location filename="../build/ui_preferences.h" line="1292"/>
         <source>Graph</source>
         <translation>גרף</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="127"/>
+        <location filename="../build/ui_preferences.h" line="1294"/>
         <source>Language</source>
         <translation>שפה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../build/ui_preferences.h" line="1296"/>
         <source>Network</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="135"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../build/ui_preferences.h" line="1298"/>
         <source>Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../build/ui_preferences.h" line="1300"/>
+        <source>Georeference</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="177"/>
+        <location filename="../qt-ui/preferences.ui" line="227"/>
+        <location filename="../build/ui_preferences.h" line="1305"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="190"/>
+        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../build/ui_preferences.h" line="1306"/>
         <source>Dives</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../build/ui_preferences.h" line="1308"/>
+        <source>No default file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../build/ui_preferences.h" line="1309"/>
+        <source>&amp;Local default file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="293"/>
+        <location filename="../build/ui_preferences.h" line="1310"/>
+        <source>Clo&amp;ud storage default file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="305"/>
+        <location filename="../build/ui_preferences.h" line="1311"/>
+        <source>Local dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="317"/>
+        <location filename="../build/ui_preferences.h" line="1312"/>
         <source>Use default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="327"/>
+        <location filename="../build/ui_preferences.h" line="1313"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="267"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>אנימציות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="412"/>
+        <location filename="../build/ui_preferences.h" line="1319"/>
         <source>Speed</source>
         <translation>מהירות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="326"/>
+        <location filename="../qt-ui/preferences.ui" line="439"/>
+        <location filename="../build/ui_preferences.h" line="1320"/>
         <source>Clear all settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="332"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../build/ui_preferences.h" line="1321"/>
         <source>Reset all settings to their default value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
+        <location filename="../build/ui_preferences.h" line="1322"/>
+        <source>Unit system</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="514"/>
+        <location filename="../build/ui_preferences.h" line="1323"/>
         <source>System</source>
         <translation>מערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>Metric</source>
-        <translation>מידה</translation>
+        <location filename="../qt-ui/preferences.ui" line="1572"/>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Imperial</source>
-        <translation>אמריקאית</translation>
+        <location filename="../qt-ui/preferences.ui" line="1578"/>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
-        <source>Personalize</source>
-        <translation>התאמה אישית</translation>
+        <location filename="../qt-ui/preferences.ui" line="1585"/>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
+        <location filename="../qt-ui/preferences.ui" line="1592"/>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1602"/>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1624"/>
+        <location filename="../qt-ui/preferences.ui" line="1641"/>
+        <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="../qt-ui/preferences.ui" line="531"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>אמריקאית</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="566"/>
+        <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="573"/>
+        <location filename="../build/ui_preferences.h" line="1329"/>
         <source>meter</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="583"/>
+        <location filename="../build/ui_preferences.h" line="1330"/>
         <source>feet</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
-        <location filename="../qt-ui/preferences.ui" line="816"/>
+        <location filename="../qt-ui/preferences.ui" line="600"/>
+        <location filename="../qt-ui/preferences.ui" line="1027"/>
+        <location filename="../build/ui_preferences.h" line="1332"/>
+        <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="610"/>
+        <location filename="../build/ui_preferences.h" line="1333"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
-        <source>liter</source>
-        <translation>ליטר</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="637"/>
+        <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>רגל מ&quot;ק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
+        <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>צלסיוס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="664"/>
+        <location filename="../build/ui_preferences.h" line="1339"/>
         <source>fahrenheit</source>
         <translation>פרנהייט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="681"/>
+        <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <location filename="../qt-ui/preferences.ui" line="1006"/>
+        <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="1013"/>
+        <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="../qt-ui/preferences.ui" line="809"/>
+        <location filename="../qt-ui/preferences.ui" line="1020"/>
+        <location filename="../build/ui_preferences.h" line="1365"/>
         <source>Default CCR set-point for dive planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <location filename="../qt-ui/preferences.ui" line="1043"/>
+        <location filename="../build/ui_preferences.h" line="1367"/>
         <source>pSCR O₂ metabolism rate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <location filename="../qt-ui/preferences.ui" line="1050"/>
+        <location filename="../build/ui_preferences.h" line="1368"/>
         <source>pSCR ratio</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <location filename="../qt-ui/preferences.ui" line="1057"/>
+        <location filename="../build/ui_preferences.h" line="1369"/>
         <source>ℓ/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <location filename="../qt-ui/preferences.ui" line="1070"/>
+        <location filename="../build/ui_preferences.h" line="1371"/>
         <source>1:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="875"/>
+        <location filename="../qt-ui/preferences.ui" line="1127"/>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1133"/>
+        <location filename="../build/ui_preferences.h" line="1373"/>
         <source>System default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="1214"/>
+        <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="920"/>
+        <location filename="../qt-ui/preferences.ui" line="1253"/>
+        <location filename="../build/ui_preferences.h" line="1379"/>
         <source>Proxy type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="933"/>
+        <location filename="../qt-ui/preferences.ui" line="1236"/>
+        <location filename="../build/ui_preferences.h" line="1377"/>
         <source>Host</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="959"/>
+        <location filename="../qt-ui/preferences.ui" line="1226"/>
+        <location filename="../build/ui_preferences.h" line="1376"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
+        <location filename="../qt-ui/preferences.ui" line="1246"/>
+        <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1005"/>
+        <location filename="../qt-ui/preferences.ui" line="1263"/>
+        <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1028"/>
+        <location filename="../qt-ui/preferences.ui" line="1312"/>
+        <location filename="../qt-ui/preferences.ui" line="1366"/>
+        <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="../qt-ui/preferences.ui" line="1071"/>
+        <location filename="../qt-ui/preferences.ui" line="1526"/>
+        <location filename="../build/ui_preferences.h" line="1400"/>
         <source>Disconnect from Facebook</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="895"/>
+        <location filename="../qt-ui/preferences.ui" line="1153"/>
+        <location filename="../build/ui_preferences.h" line="1374"/>
         <source>Filter</source>
         <translation>פילטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="439"/>
+        <location filename="../qt-ui/preferences.ui" line="593"/>
+        <location filename="../build/ui_preferences.h" line="1331"/>
         <source>Pressure</source>
         <translation>לחץ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="161"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <location filename="../build/ui_preferences.h" line="1303"/>
         <source>Lists and tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="196"/>
+        <location filename="../qt-ui/preferences.ui" line="264"/>
+        <location filename="../build/ui_preferences.h" line="1307"/>
         <source>Default dive log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="227"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
+        <location filename="../build/ui_preferences.h" line="1314"/>
         <source>Display invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="244"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
+        <location filename="../build/ui_preferences.h" line="1316"/>
         <source>Default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="250"/>
+        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../build/ui_preferences.h" line="1317"/>
         <source>Use default cylinder</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="300"/>
+        <location filename="../qt-ui/preferences.ui" line="1350"/>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <location filename="../qt-ui/preferences.cpp" line="123"/>
+        <source>Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1359"/>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
+        <translation>כתובת אימייל</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1373"/>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1380"/>
+        <source>New password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1408"/>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1415"/>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1425"/>
+        <location filename="../build/ui_preferences.h" line="1397"/>
         <source>Subsurface web service</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="1446"/>
+        <location filename="../build/ui_preferences.h" line="1398"/>
         <source>Default user ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="1456"/>
+        <location filename="../build/ui_preferences.h" line="1399"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="466"/>
+        <location filename="../qt-ui/preferences.ui" line="620"/>
+        <location filename="../build/ui_preferences.h" line="1334"/>
         <source>Volume</source>
         <translation>נפח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <location filename="../qt-ui/preferences.ui" line="647"/>
+        <location filename="../build/ui_preferences.h" line="1337"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="674"/>
+        <location filename="../build/ui_preferences.h" line="1340"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="537"/>
+        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../build/ui_preferences.h" line="1342"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="552"/>
+        <location filename="../qt-ui/preferences.ui" line="706"/>
+        <location filename="../build/ui_preferences.h" line="1343"/>
         <source>Time units</source>
         <translation>יחידות זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="719"/>
+        <location filename="../build/ui_preferences.h" line="1345"/>
         <source>Minutes</source>
         <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="575"/>
+        <location filename="../qt-ui/preferences.ui" line="729"/>
+        <location filename="../build/ui_preferences.h" line="1346"/>
         <source>Seconds</source>
         <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="607"/>
+        <location filename="../qt-ui/preferences.ui" line="818"/>
+        <location filename="../build/ui_preferences.h" line="1351"/>
         <source>Show</source>
         <translation>הצג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="788"/>
+        <location filename="../qt-ui/preferences.ui" line="999"/>
+        <location filename="../build/ui_preferences.h" line="1362"/>
         <source>GFLow at max depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
+        <location filename="../build/ui_preferences.h" line="1359"/>
         <source>Misc</source>
         <translation>שונות</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../build/ui_preferences.h" line="1283"/>
         <source>Preferences</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="558"/>
+        <location filename="../qt-ui/preferences.ui" line="521"/>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="541"/>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="627"/>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="712"/>
+        <location filename="../build/ui_preferences.h" line="1344"/>
         <source>Ascent/descent speed denominator</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="744"/>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="750"/>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="757"/>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="829"/>
+        <location filename="../build/ui_preferences.h" line="1352"/>
         <source>Threshold when showing pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="642"/>
+        <location filename="../qt-ui/preferences.ui" line="853"/>
+        <location filename="../build/ui_preferences.h" line="1353"/>
         <source>Threshold when showing pN₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="877"/>
+        <location filename="../build/ui_preferences.h" line="1354"/>
         <source>Threshold when showing pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <location filename="../qt-ui/preferences.ui" line="901"/>
+        <location filename="../build/ui_preferences.h" line="1355"/>
         <source>Max pO₂ when showing MOD</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <location filename="../build/ui_preferences.h" line="1356"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="725"/>
+        <location filename="../qt-ui/preferences.ui" line="936"/>
+        <location filename="../build/ui_preferences.h" line="1357"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="736"/>
+        <location filename="../qt-ui/preferences.ui" line="947"/>
+        <location filename="../build/ui_preferences.h" line="1358"/>
         <source>Show average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <location filename="../qt-ui/preferences.ui" line="965"/>
+        <location filename="../build/ui_preferences.h" line="1360"/>
         <source>GFLow</source>
         <translation>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="982"/>
+        <location filename="../build/ui_preferences.h" line="1361"/>
         <source>GFHigh</source>
         <translation>גרדיאנט עליון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="38"/>
+        <location filename="../qt-ui/preferences.cpp" line="42"/>
         <source>No proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="39"/>
+        <location filename="../qt-ui/preferences.cpp" line="43"/>
         <source>System proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="40"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>HTTP proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="41"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>SOCKS proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="80"/>
+        <location filename="../qt-ui/preferences.cpp" line="86"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="94"/>
+        <location filename="../qt-ui/preferences.cpp" line="100"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="333"/>
+        <location filename="../qt-ui/preferences.cpp" line="120"/>
+        <source>Subsurface cloud storage (credentials verified)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="329"/>
         <source>Restart required</source>
         <translation>נדרשת הפעלה מחדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="334"/>
+        <location filename="../qt-ui/preferences.cpp" line="330"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>כדי לטעון שפה חדשה בצורה נכונה עליך להפעיל מחדש את Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="503"/>
+        <location filename="../qt-ui/preferences.cpp" line="360"/>
+        <location filename="../qt-ui/preferences.cpp" line="382"/>
+        <location filename="../qt-ui/preferences.cpp" line="395"/>
+        <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="../qt-ui/preferences.cpp" line="487"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="489"/>
+        <location filename="../qt-ui/preferences.cpp" line="473"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>קבצי XML  נתמכים (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="489"/>
+        <location filename="../qt-ui/preferences.cpp" line="473"/>
         <source>Open default log file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="502"/>
+        <location filename="../qt-ui/preferences.cpp" line="486"/>
         <source>Warning</source>
         <translation>אזהרה</translation>
     </message>
@@ -4228,191 +5639,187 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="85"/>
+        <location filename="../qt-ui/printdialog.cpp" line="119"/>
         <source>&amp;Preview</source>
         <translation>&amp;תצוגה מקדימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="82"/>
+        <location filename="../qt-ui/printdialog.cpp" line="116"/>
         <source>P&amp;rint</source>
         <translation>ה&amp;דפס</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="97"/>
+        <location filename="../qt-ui/printdialog.cpp" line="131"/>
         <source>Print</source>
         <translation>הדפס</translation>
     </message>
 </context>
 <context>
-    <name>PrintLayout</name>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="20"/>
-        <source>Dive#</source>
-        <translation>מספר צלילה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="21"/>
-        <source>Date</source>
-        <translation>תאריך</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="22"/>
-        <source>Depth</source>
-        <translation>עומק</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="23"/>
-        <source>Duration</source>
-        <translation>משך הצלילה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="24"/>
-        <source>Master</source>
-        <translation>מדריך</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
-        <source>Buddy</source>
-        <translation>בן זוג</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
-        <source>Location</source>
-        <translation>מיקום</translation>
-    </message>
+    <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="63"/>
-        <source>Subsurface cannot find a usable printer on this system!</source>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="41"/>
-        <source>&amp;6 dives per page</source>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="57"/>
-        <source>&amp;1 dive per page</source>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="70"/>
-        <source>&amp;2 dives per page</source>
+        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <location filename="../build/ui_printoptions.h" line="149"/>
+        <source>&amp;Dive list print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="83"/>
-        <source>&amp;Table print</source>
+        <location filename="../qt-ui/printoptions.ui" line="57"/>
+        <location filename="../build/ui_printoptions.h" line="151"/>
+        <source>&amp;Statistics print</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="106"/>
+        <location filename="../qt-ui/printoptions.ui" line="67"/>
+        <location filename="../build/ui_printoptions.h" line="152"/>
         <source>Print options</source>
         <translation>אפשרויות הדפסה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="118"/>
+        <location filename="../qt-ui/printoptions.ui" line="79"/>
+        <location filename="../build/ui_printoptions.h" line="153"/>
         <source>Print only selected dives</source>
         <translation>הדפס רק צלילות נבחרות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="131"/>
+        <location filename="../qt-ui/printoptions.ui" line="92"/>
+        <location filename="../build/ui_printoptions.h" line="154"/>
         <source>Print in color</source>
         <translation>הדפס בצבע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="153"/>
-        <source>Prof&amp;ile on top</source>
+        <location filename="../qt-ui/printoptions.ui" line="102"/>
+        <location filename="../build/ui_printoptions.h" line="155"/>
+        <source>Template</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="169"/>
-        <source>&amp;Notes on top</source>
+        <location filename="../qt-ui/printoptions.ui" line="127"/>
+        <location filename="../build/ui_printoptions.h" line="161"/>
+        <source>Edit</source>
+        <translation>ערוך</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="134"/>
+        <source>Delete</source>
+        <translation>למחוק</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="141"/>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
         <source>Print type</source>
         <translation>סוג הדפסה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="141"/>
-        <source>Ordering</source>
-        <translation>סדר</translation>
+        <location filename="../qt-ui/printoptions.cpp" line="150"/>
+        <source>Import template file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.cpp" line="151"/>
+        <location filename="../qt-ui/printoptions.cpp" line="164"/>
+        <source>HTML files (*.html)</source>
+        <translation>קבצי HTML (*.html)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.cpp" line="163"/>
+        <source>Export template files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2101"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="44"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2106"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="49"/>
         <source>Dive #%1 - %2</source>
         <translation>צלילות מס %1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2109"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="52"/>
         <source>Max depth: %1 %2</source>
         <translation>עומק מקסימלי: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2116"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="59"/>
         <source>Duration: %1 min</source>
         <translation>זמן: %1 דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="64"/>
         <source>Gas used:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2123"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="66"/>
         <source>Tags:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2125"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="68"/>
         <source>SAC:</source>
         <translation>צריכת אויר:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2127"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="70"/>
         <source>Weights:</source>
         <translation>משקולות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2132"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="75"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="82"/>
         <source>Divemaster:</source>
         <translation>מדריך צלילה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="84"/>
         <source>Buddy:</source>
         <translation>בן זוג:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2143"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="86"/>
         <source>Suit:</source>
         <translation>חליפה:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2145"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="88"/>
         <source>Viz:</source>
         <translation>ראות:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2147"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="90"/>
         <source>Rating:</source>
         <translation>דירוג</translation>
     </message>
@@ -4420,108 +5827,113 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="658"/>
         <source> (#%1 of %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="660"/>
         <source>Unknown dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="677"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1224"/>
         <source>Make first divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1226"/>
         <source>Delete this divecomputer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1240"/>
         <source>Add gas change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1243"/>
         <source> (Tank %1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1251"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1253"/>
         <source>Add bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1257"/>
+        <source>Edit the profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/>
         <source>Remove event</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1266"/>
         <source>Hide similar events</source>
         <translation>הסתר אירועים דומים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1273"/>
         <source>Edit name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1302"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1309"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1324"/>
         <source>Unhide all events</source>
         <translation>חשוף את כל האירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/>
         <source>Hide events</source>
         <translation>הסתר אירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/>
         <source>Hide all %1 events?</source>
         <translation>הסתר את כל %1 האירועים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1393"/>
         <source>Remove the selected event?</source>
         <translation>הסר את האירוע שנבחרו?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1394"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1498"/>
         <source>Edit name of bookmark</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1499"/>
         <source>Custom name:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1504"/>
         <source>Name is too long!</source>
         <translation type="unfinished"/>
     </message>
@@ -4529,102 +5941,97 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
+        <location filename="../qthelper.cpp" line="1210"/>
         <source>AIR</source>
         <translation>אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
+        <location filename="../qthelper.cpp" line="1210"/>
         <source>OXYGEN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="55"/>
         <source>Remove this point</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
-        <source>Close</source>
-        <translation>סגור</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Average</source>
         <translation>ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Minimum</source>
         <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="36"/>
         <source>Maximum</source>
         <translation>מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="296"/>
+        <location filename="../qt-ui/globe.cpp" line="322"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="525"/>
+        <location filename="../qthelper.cpp" line="1224"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="526"/>
+        <location filename="../qthelper.cpp" line="1225"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="550"/>
+        <location filename="../qthelper.cpp" line="1248"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="551"/>
+        <location filename="../qthelper.cpp" line="1249"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="574"/>
+        <location filename="../qthelper.cpp" line="1271"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="575"/>
+        <location filename="../qthelper.cpp" line="1272"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="599"/>
+        <location filename="../qthelper.cpp" line="1294"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="600"/>
+        <location filename="../qthelper.cpp" line="1295"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="593"/>
         <source>Invalid response from server</source>
         <translation>תגובה לא חוקית מהשרת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="601"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>תג XML הצפוי &apos;DiveDates&apos; לא נמצא</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="654"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>תגובת XML פגומה. שורה %1: %2</translation>
     </message>
@@ -4632,12 +6039,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1520"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1586"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1638"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1512"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1641"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4646,17 +6058,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
+        <location filename="../build/ui_renumber.h" line="79"/>
         <source>Renumber</source>
         <translation>מספר מחדש</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
+        <location filename="../build/ui_renumber.h" line="80"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="139"/>
         <source>New starting number</source>
         <translation>מספר התחלתי חדש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation type="unfinished"/>
     </message>
@@ -4664,12 +6078,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1655"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1816"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1837"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1659"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1840"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -4678,6 +6097,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SearchBar</name>
     <message>
         <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <location filename="../build/ui_searchbar.h" line="120"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
@@ -4686,16 +6106,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SetpointDialog</name>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="17"/>
+        <location filename="../build/ui_setpoint.h" line="82"/>
         <source>Renumber</source>
         <translation>מספר מחדש</translation>
     </message>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="43"/>
+        <location filename="../build/ui_setpoint.h" line="83"/>
         <source>New set-point (0 for OC)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="61"/>
+        <location filename="../build/ui_setpoint.h" line="84"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4704,56 +6127,73 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>ShiftImageTimesDialog</name>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="186"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/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="../qt-ui/shiftimagetimes.ui" line="105"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="188"/>
         <source>Later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="148"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="128"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="189"/>
+        <source>Warning!
+Not all images have timestamps in the range between
+30 minutes before the start and 30 minutes after the end of any selected dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="173"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="193"/>
         <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="158"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="183"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="195"/>
         <source>Determine camera time offset</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="161"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="186"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="197"/>
         <source>Select image of divecomputer showing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="183"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="208"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="199"/>
         <source>Which date and time are displayed on the image?</source>
         <translation>איזה תאריך ושעה מוצגים בתמונה?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="289"/>
         <source>Open image file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="291"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation type="unfinished"/>
     </message>
@@ -4762,92 +6202,134 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>ShiftTimesDialog</name>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="23"/>
+        <location filename="../build/ui_shifttimes.h" line="136"/>
         <source>Shift selected dive times</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="49"/>
+        <location filename="../build/ui_shifttimes.h" line="137"/>
         <source>Shift times of selected dives by</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
+        <location filename="../build/ui_shifttimes.h" line="138"/>
         <source>Shifted time:</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
+        <location filename="../build/ui_shifttimes.h" line="139"/>
         <source>Current time:</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
+        <location filename="../build/ui_shifttimes.h" line="140"/>
+        <location filename="../build/ui_shifttimes.h" line="141"/>
         <source>0:0</source>
         <translation>0:0</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
+        <location filename="../build/ui_shifttimes.h" line="142"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="136"/>
+        <location filename="../build/ui_shifttimes.h" line="143"/>
         <source>Earlier</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="143"/>
+        <location filename="../build/ui_shifttimes.h" line="144"/>
         <source>Later</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>SimpleDiveSiteEditDialog</name>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="99"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="100"/>
+        <source>Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="101"/>
+        <source>Coordinates</source>
+        <translation>קואורדינטות</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="102"/>
+        <source>Description</source>
+        <translation>תיאור</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="103"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="104"/>
+        <source>Dive site quick edit. Hit ESC or click outside to close</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="283"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="298"/>
         <source>Dive date: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="286"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="301"/>
         <source>Duration: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="287"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="302"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="288"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="303"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="291"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="306"/>
         <source>Dive location: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="294"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="309"/>
         <source>Buddy: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="297"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="312"/>
         <source>Divemaster: %1 
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="300"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="315"/>
         <source>
 %1</source>
         <translation type="unfinished"/>
@@ -4857,61 +6339,73 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SocialnetworksDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="140"/>
         <source>Dialog</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="141"/>
         <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="142"/>
         <source>Album</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="144"/>
         <source>The profile picture will be posted in this album (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="146"/>
         <source>Include</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="147"/>
         <source>Date and time</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="148"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="149"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="150"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="151"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="152"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="153"/>
         <source>Facebook post preview</source>
         <translation type="unfinished"/>
     </message>
@@ -4920,26 +6414,30 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>SubsurfaceAbout</name>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
+        <location filename="../build/ui_about.h" line="109"/>
         <source>About Subsurface</source>
         <translation>אודות Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="80"/>
+        <location filename="../build/ui_about.h" line="112"/>
         <source>&amp;License</source>
         <translation>&amp;רישיון</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="87"/>
+        <location filename="../build/ui_about.h" line="113"/>
         <source>&amp;Website</source>
         <translation>&amp;אתר אינטרנט</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="94"/>
+        <location filename="../build/ui_about.h" line="114"/>
         <source>&amp;Close</source>
         <translation>&amp;סגור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="18"/>
+        <location filename="../qt-ui/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
         <translation type="unfinished"/>
     </message>
@@ -4947,47 +6445,47 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="387"/>
         <source>Webservice</source>
         <translation>שרות איטרנט</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="473"/>
         <source>Connecting...</source>
         <translation>מתחבר...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="492"/>
         <source>Download finished</source>
         <translation>ההורדה הסתיימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Download error: %1</source>
         <translation>שגיאת הורדה: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="516"/>
         <source>Connection error: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
         <source>Download successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="519"/>
         <source>Invalid user identifier!</source>
         <translation>שם משתמש לא חוקי!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="366"/>
         <source>Enter User ID and click Download</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="522"/>
         <source>Cannot parse response!</source>
         <translation>תשובה לא מובנת!</translation>
     </message>
@@ -4995,7 +6493,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="648"/>
         <source>Suits: </source>
         <translation type="unfinished"/>
     </message>
@@ -5003,7 +6501,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
+        <location filename="../qt-models/filtermodels.cpp" line="119"/>
         <source>No suit set</source>
         <translation type="unfinished"/>
     </message>
@@ -5013,6 +6511,8 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <location filename="../qt-ui/tableview.ui" line="17"/>
+        <location filename="../build/ui_tableview.h" line="49"/>
+        <location filename="../build/ui_tableview.h" line="50"/>
         <source>GroupBox</source>
         <translation type="unfinished"/>
     </message>
@@ -5020,7 +6520,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="569"/>
         <source>Tags: </source>
         <translation type="unfinished"/>
     </message>
@@ -5028,7 +6528,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
+        <location filename="../qt-models/filtermodels.cpp" line="144"/>
         <source>Empty tags</source>
         <translation type="unfinished"/>
     </message>
@@ -5036,22 +6536,248 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="916"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="916"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
         <source>ml</source>
         <translation>מ&quot;ל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="916"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
+    <name>TemplateEdit</name>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="37"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="94"/>
+        <source>Style</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="104"/>
+        <source>Font</source>
+        <translation>גופן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="112"/>
+        <source>Arial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="117"/>
+        <source>Impact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="122"/>
+        <source>Georgia</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="127"/>
+        <source>Courier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="132"/>
+        <source>Verdana</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="144"/>
+        <source>Font size</source>
+        <translation>גודל גופן</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="165"/>
+        <source>Color palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="173"/>
+        <source>Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="178"/>
+        <source>Almond</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="183"/>
+        <source>Shades of blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="188"/>
+        <source>Custom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="200"/>
+        <source>Line spacing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="241"/>
+        <source>Template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="264"/>
+        <source>Colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="280"/>
+        <source>Background</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="293"/>
+        <source>color1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="303"/>
+        <location filename="../qt-ui/templateedit.ui" line="343"/>
+        <location filename="../qt-ui/templateedit.ui" line="383"/>
+        <location filename="../qt-ui/templateedit.ui" line="423"/>
+        <location filename="../qt-ui/templateedit.ui" line="463"/>
+        <location filename="../qt-ui/templateedit.ui" line="503"/>
+        <source>Edit</source>
+        <translation>ערוך</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="320"/>
+        <source>Table cells 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="333"/>
+        <source>color2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="360"/>
+        <source>Table cells 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="373"/>
+        <source>color3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="400"/>
+        <source>Text 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="413"/>
+        <source>color4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="440"/>
+        <source>Text 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="453"/>
+        <source>color5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="480"/>
+        <source>Borders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="493"/>
+        <source>color6</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TestParse</name>
+    <message>
+        <location filename="../tests/testparse.cpp" line="296"/>
+        <source>Sample time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="298"/>
+        <source>Sample depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="300"/>
+        <source>Sample temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="302"/>
+        <source>Sample pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="304"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="306"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="308"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="310"/>
+        <source>Sample CNS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="312"/>
+        <source>Sample NDL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="314"/>
+        <source>Sample TTS</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="316"/>
+        <source>Sample stopdepth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="318"/>
+        <source>Sample pressure</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
@@ -5060,82 +6786,105 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     </message>
 </context>
 <context>
+    <name>TopBar</name>
+    <message>
+        <location filename="../qt-mobile/TopBar.qml" line="59"/>
+        <source>Subsurface mobile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1094"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
         <source> (%1 shown)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>URLDialog</name>
+    <message>
+        <location filename="../qt-ui/urldialog.ui" line="14"/>
+        <location filename="../build/ui_urldialog.h" line="57"/>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/urldialog.ui" line="52"/>
+        <location filename="../build/ui_urldialog.h" line="58"/>
+        <source>Enter URL for images</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="81"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="83"/>
         <source>Check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="82"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="89"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="90"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="98"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="100"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="101"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="107"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="109"/>
         <source>A new version of Subsurface is available.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="108"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="110"/>
         <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="../qt-ui/updatemanager.cpp" line="118"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="120"/>
         <source>Newest release version is </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="119"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>The server returned the following information:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="136"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="139"/>
         <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="../qt-ui/updatemanager.cpp" line="137"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="140"/>
         <source>Decline</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="138"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="141"/>
         <source>Accept</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="140"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="143"/>
         <source>Automatic check for updates</source>
         <translation type="unfinished"/>
     </message>
@@ -5158,71 +6907,85 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
     <name>UserSurvey</name>
     <message>
         <location filename="../qt-ui/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="../qt-ui/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
         <source>Other software/sources</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
         <source>Manually entering dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="31"/>
+        <location filename="../build/ui_usersurvey.h" line="150"/>
         <source>Subsurface user survey</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="63"/>
+        <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="76"/>
+        <location filename="../build/ui_usersurvey.h" line="153"/>
         <source>Recreational diver</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="89"/>
+        <location filename="../build/ui_usersurvey.h" line="154"/>
         <source>Dive planner</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="102"/>
+        <location filename="../build/ui_usersurvey.h" line="155"/>
         <source>Supported dive computer</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="141"/>
+        <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="154"/>
+        <location filename="../build/ui_usersurvey.h" line="159"/>
         <source>Any suggestions? (in English)</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="177"/>
+        <location filename="../build/ui_usersurvey.h" line="160"/>
         <source>The following information about your system will also be submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="231"/>
+        <location filename="../build/ui_usersurvey.h" line="161"/>
         <source>What kind of diver are you?</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="270"/>
+        <location filename="../build/ui_usersurvey.h" line="162"/>
         <source>Where are you importing data from?</source>
         <translation type="unfinished"/>
     </message>
@@ -5251,27 +7014,27 @@ Language: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
         <source>Should we ask you later?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
         <source>Don&apos;t ask me again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="81"/>
         <source>Ask later</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
         <source>Submit user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="98"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation type="unfinished"/>
     </message>
@@ -5281,27 +7044,27 @@ Language: %1</source>
         <translation>שלח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="118"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="107"/>
         <source>The following error occurred:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="124"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="108"/>
         <source>Please check your internet connection.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="133"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Survey successfully submitted.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="138"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation type="unfinished"/>
     </message>
@@ -5309,12 +7072,12 @@ Language: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="787"/>
+        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="79"/>
         <source>Description</source>
         <translation>תיאור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="787"/>
+        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="79"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
@@ -5323,51 +7086,59 @@ Language: %1</source>
     <name>WebServices</name>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
+        <location filename="../build/ui_webservices.h" line="129"/>
         <source>Web service connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
+        <location filename="../build/ui_webservices.h" line="130"/>
         <source>Status:</source>
         <translation>מצב:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
+        <location filename="../build/ui_webservices.h" line="131"/>
         <source>Enter your ID here</source>
         <translation>הכנס זיהוי כאן</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="44"/>
+        <location filename="../build/ui_webservices.h" line="132"/>
         <source>Download</source>
         <translation>הורדה</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="68"/>
+        <location filename="../build/ui_webservices.h" line="133"/>
         <source>User ID</source>
         <translation>זיהוי משתמש</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
+        <location filename="../build/ui_webservices.h" line="135"/>
         <source>Save user ID locally?</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
+        <location filename="../build/ui_webservices.h" line="136"/>
         <source>Password</source>
         <translation>סיסמא</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="106"/>
+        <location filename="../build/ui_webservices.h" line="137"/>
         <source>Upload</source>
         <translation>ההעלאה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/>
         <source>Operation timed out</source>
         <translation>הפעולה נכשלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="322"/>
         <source>Transferring data...</source>
         <translation type="unfinished"/>
     </message>
@@ -5375,37 +7146,51 @@ Language: %1</source>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="434"/>
+        <location filename="../qt-models/weightmodel.cpp" line="13"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="434"/>
+        <location filename="../qt-models/weightmodel.cpp" line="13"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="500"/>
+        <location filename="../qt-models/weightmodel.cpp" line="77"/>
         <source>Clicking here will remove this weight system.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>WinBluetoothDeviceDiscoveryAgent</name>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="518"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="549"/>
+        <source>No error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1549"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1557"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1568"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1673"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1692"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1700"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1710"/>
         <source>Failed!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1578"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1719"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1582"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1722"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation type="unfinished"/>
     </message>
@@ -5413,79 +7198,79 @@ Language: %1</source>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="126"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>שנה
 &gt; חודש / טיול</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="129"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="132"/>
         <source>Duration 
  Total</source>
         <translation>משך
 כולל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="135"/>
         <source>
 Average</source>
         <translation>
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="138"/>
         <source>
 Shortest</source>
         <translation>
 קצר ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Longest</source>
         <translation>
 ארוך ביותר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>Depth (%1)
  Average</source>
         <translation>עומק (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
-        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="147"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="156"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="165"/>
         <source>
 Minimum</source>
         <translation>
 מינימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
-        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="150"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="159"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="168"/>
         <source>
 Maximum</source>
         <translation>
 מקסימום</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>SAC (%1)
  Average</source>
         <translation>צריכת אויר (%1)
 ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="162"/>
         <source>Temp. (%1)
  Average</source>
         <translation>טמפ&apos; (%1)
@@ -5493,88 +7278,134 @@ Maximum</source>
     </message>
 </context>
 <context>
+    <name>getTextFromC</name>
+    <message>
+        <location filename="../taxonomy.c" line="6"/>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="7"/>
+        <source>Ocean</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="8"/>
+        <source>Country</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="9"/>
+        <source>State</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="10"/>
+        <source>County</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="11"/>
+        <source>Town</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="12"/>
+        <source>City</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>getextFromC</name>
+    <message>
+        <location filename="../libdivecomputer.c" line="640"/>
+        <source>Error parsing the header</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="191"/>
+        <location filename="../dive.c" line="193"/>
         <source>pascal</source>
         <translation>פסקל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="196"/>
-        <location filename="../qt-gui.cpp" line="340"/>
+        <location filename="../dive.c" line="198"/>
+        <location filename="../qthelper.cpp" line="895"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="200"/>
-        <location filename="../qt-gui.cpp" line="343"/>
+        <location filename="../dive.c" line="202"/>
+        <location filename="../qthelper.cpp" line="898"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="242"/>
+        <location filename="../dive.c" line="244"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="279"/>
-        <location filename="../qt-gui.cpp" line="222"/>
-        <location filename="../qt-gui.cpp" line="237"/>
+        <location filename="../dive.c" line="281"/>
+        <location filename="../qthelper.cpp" line="777"/>
+        <location filename="../qthelper.cpp" line="792"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="284"/>
-        <location filename="../qt-gui.cpp" line="225"/>
-        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../dive.c" line="286"/>
+        <location filename="../qthelper.cpp" line="780"/>
+        <location filename="../qthelper.cpp" line="794"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="307"/>
+        <location filename="../dive.c" line="309"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="309"/>
+        <location filename="../dive.c" line="311"/>
         <source>m/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="314"/>
+        <location filename="../dive.c" line="316"/>
         <source>ft/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="316"/>
+        <location filename="../dive.c" line="318"/>
         <source>ft/s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="335"/>
-        <location filename="../qt-gui.cpp" line="248"/>
-        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../dive.c" line="337"/>
+        <location filename="../qthelper.cpp" line="803"/>
+        <location filename="../qthelper.cpp" line="813"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="339"/>
-        <location filename="../qt-gui.cpp" line="246"/>
-        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../dive.c" line="341"/>
+        <location filename="../qthelper.cpp" line="801"/>
+        <location filename="../qthelper.cpp" line="811"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1530"/>
+        <location filename="../dive.c" line="1558"/>
         <source>(%s) or (%s)</source>
         <translation>(%S) או (%S)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="468"/>
+        <location filename="../divelist.c" line="482"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1081"/>
-        <location filename="../planner.c" line="1084"/>
+        <location filename="../planner.c" line="1365"/>
+        <location filename="../planner.c" line="1368"/>
         <source>air</source>
         <translation>אוויר</translation>
     </message>
@@ -5604,437 +7435,357 @@ Maximum</source>
         <translation>נצמד</translation>
     </message>
     <message>
-        <location filename="../file.c" line="112"/>
-        <location filename="../file.c" line="434"/>
-        <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="925"/>
+        <location filename="../file.c" line="117"/>
+        <location filename="../file.c" line="456"/>
+        <location filename="../file.c" line="541"/>
+        <location filename="../file.c" line="938"/>
+        <location filename="../ostctools.c" line="82"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>קריאה מ&apos;%S&apos; נכשלה</translation>
     </message>
     <message>
-        <location filename="../file.c" line="377"/>
+        <location filename="../file.c" line="391"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="600"/>
+        <location filename="../file.c" line="458"/>
+        <source>Empty file &apos;%s&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="638"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="629"/>
+        <location filename="../file.c" line="674"/>
         <source>Mouth piece position OC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="633"/>
+        <location filename="../file.c" line="678"/>
         <source>Mouth piece position CC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="637"/>
+        <location filename="../file.c" line="682"/>
         <source>Mouth piece position unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="641"/>
+        <location filename="../file.c" line="686"/>
         <source>Mouth piece position not connected</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="647"/>
+        <location filename="../file.c" line="693"/>
         <source>Power off</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="707"/>
+        <location filename="../file.c" line="753"/>
         <source>O₂ calibration failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="709"/>
-        <location filename="../file.c" line="718"/>
+        <location filename="../file.c" line="755"/>
+        <location filename="../file.c" line="764"/>
         <source>O₂ calibration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="785"/>
+        <location filename="../file.c" line="831"/>
         <source>No matching DC found for file &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="870"/>
-        <location filename="../file.c" line="917"/>
-        <location filename="../file.c" line="1016"/>
-        <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>none</source>
         <translation>אין</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="305"/>
-        <location filename="../cochran.c" line="311"/>
-        <location filename="../cochran.c" line="381"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="306"/>
+        <location filename="../cochran.c" line="312"/>
+        <location filename="../cochran.c" line="382"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>deco stop</source>
         <translation>עצירה לדיקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="338"/>
-        <location filename="../file.c" line="653"/>
+        <location filename="../cochran.c" line="339"/>
+        <location filename="../file.c" line="699"/>
         <source>battery</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../cochran.c" line="366"/>
-        <location filename="../cochran.c" line="405"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="367"/>
+        <location filename="../cochran.c" line="406"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>rbt</source>
         <translation>זמן נותר בעומק</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="332"/>
-        <location filename="../cochran.c" line="386"/>
-        <location filename="../file.c" line="675"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="333"/>
+        <location filename="../cochran.c" line="387"/>
+        <location filename="../file.c" line="721"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>ascent</source>
         <translation>עליה</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="375"/>
-        <location filename="../cochran.c" line="422"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="376"/>
+        <location filename="../cochran.c" line="423"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>ceiling</source>
         <translation>תקרה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>workload</source>
         <translation>עומס</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="391"/>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../cochran.c" line="392"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>transmitter</source>
         <translation>משדר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>violation</source>
         <translation>חריגה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>bookmark</source>
         <translation>סימניה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>surface</source>
         <translation>שטח</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>safety stop</source>
         <translation>עצירת בטיחות</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="361"/>
-        <location filename="../cochran.c" line="410"/>
-        <location filename="../cochran.c" line="417"/>
-        <location filename="../file.c" line="766"/>
-        <location filename="../libdivecomputer.c" line="122"/>
-        <location filename="../libdivecomputer.c" line="125"/>
+        <location filename="../cochran.c" line="362"/>
+        <location filename="../cochran.c" line="411"/>
+        <location filename="../cochran.c" line="418"/>
+        <location filename="../file.c" line="812"/>
+        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="170"/>
         <source>gaschange</source>
         <translation>החלפת גז</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="122"/>
+        <location filename="../libdivecomputer.c" line="167"/>
         <source>safety stop (voluntary)</source>
         <translation>עצירת בטיחות (יזומה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="122"/>
+        <location filename="../libdivecomputer.c" line="167"/>
         <source>safety stop (mandatory)</source>
         <translation>עצירת בטיחות (חובה)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>deepstop</source>
         <translation>עצירה בעומק</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>ceiling (safety stop)</source>
         <translation>תקרה (עצירת בטיחות)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>divetime</source>
         <translation>זמןצלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../cochran.c" line="349"/>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../cochran.c" line="350"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>maxdepth</source>
         <translation>עומק מקס&apos;</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="344"/>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../cochran.c" line="345"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>airtime</source>
         <translation>זמן אויר</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>heading</source>
         <translation>כותרת</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="354"/>
-        <location filename="../cochran.c" line="400"/>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../cochran.c" line="355"/>
+        <location filename="../cochran.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="125"/>
+        <location filename="../libdivecomputer.c" line="170"/>
         <source>tissue level warning</source>
         <translation>אזהרת רמות רקמות</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="125"/>
+        <location filename="../libdivecomputer.c" line="170"/>
         <source>non stop time</source>
         <translation>זמן ללא עצירה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <source>invalid event number</source>
         <translation>מס&apos; ארוע שגוי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>Unable to create parser for %s %s</source>
         <translation>לא מצליח להבין %s %s </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="425"/>
+        <location filename="../libdivecomputer.c" line="630"/>
         <source>Error registering the data</source>
         <translation>שגיאה ברישום המידע</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="433"/>
+        <location filename="../libdivecomputer.c" line="459"/>
         <source>Error parsing the datetime</source>
         <translation>שגיאה בקריאת תאריך</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="450"/>
+        <location filename="../libdivecomputer.c" line="477"/>
         <source>Dive %d: %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="454"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing the divetime</source>
         <translation>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="464"/>
+        <location filename="../libdivecomputer.c" line="493"/>
         <source>Error parsing the maxdepth</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="483"/>
+        <location filename="../libdivecomputer.c" line="512"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="503"/>
+        <location filename="../libdivecomputer.c" line="532"/>
         <source>Error parsing the gas mix count</source>
         <translation>שגיאה בקריאת תערובת גזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="544"/>
         <source>Error obtaining water salinity</source>
         <translation>שגיאה בקבלת מליחות מים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="524"/>
+        <location filename="../libdivecomputer.c" line="553"/>
         <source>Error obtaining surface pressure</source>
         <translation>שגיאה בקבלת לחץ על פני המים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="549"/>
+        <location filename="../libdivecomputer.c" line="578"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="598"/>
         <source>Error parsing the gas mix</source>
         <translation>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="576"/>
+        <location filename="../libdivecomputer.c" line="650"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="713"/>
+        <location filename="../libdivecomputer.c" line="787"/>
         <source>Event: waiting for user action</source>
         <translation>אירוע: מחכה לפעולה של המשתמש</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="721"/>
+        <location filename="../libdivecomputer.c" line="795"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="785"/>
+        <location filename="../libdivecomputer.c" line="859"/>
         <source>Error registering the event handler.</source>
         <translation>שגיאה ברישום שגרת ניהול</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="790"/>
+        <location filename="../libdivecomputer.c" line="864"/>
         <source>Error registering the cancellation handler.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="811"/>
+        <location filename="../libdivecomputer.c" line="885"/>
         <source>Dive data import error</source>
         <translation>שגיאת יבוא נתוני צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="924"/>
         <source>Unable to create libdivecomputer context</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="857"/>
+        <location filename="../libdivecomputer.c" line="931"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>לא ניתן לפתוח את %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="516"/>
+        <location filename="../parse-xml.c" line="522"/>
         <source>Strange percentage reading %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1770"/>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="1999"/>
-        <location filename="../parse-xml.c" line="2147"/>
-        <source>Database query dm4_events failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2006"/>
-        <location filename="../parse-xml.c" line="2154"/>
-        <source>Database query dm4_tags failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2328"/>
-        <source>Database query shearwater_cylinders failed.
+        <location filename="../parse-xml.c" line="1240"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2335"/>
-        <source>Database query shearwater_changes failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2342"/>
-        <source>Database query shearwater_profile_sample failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2461"/>
-        <source>Database query cobalt_cylinders failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2468"/>
-        <source>Database query cobalt_buddies failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2475"/>
-        <source>Database query cobalt_visibility failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2482"/>
-        <source>Database query cobalt_location failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2489"/>
-        <source>Database query cobalt_location (site) failed.
-</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2496"/>
-        <source>Database query cobalt_profile_sample failed.
-</source>
+        <location filename="../parse-xml.c" line="2026"/>
+        <source>Failed to parse &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../file.c" line="174"/>
-        <source>Database connection failed '%s'.
-</source>
-        <translation>החיבור למסד הנתונים נכשל &apos;%s&apos;.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2178"/>
-        <location filename="../parse-xml.c" line="2199"/>
-        <location filename="../parse-xml.c" line="2518"/>
-        <location filename="../parse-xml.c" line="2537"/>
-        <source>Database query failed '%s'.
-</source>
-        <translation>שאילתת מסד נתונים נכשל &apos;%s&apos;.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2909"/>
+        <location filename="../parse-xml.c" line="3619"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation>
     </message>
@@ -6044,12 +7795,13 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="841"/>
+        <location filename="../planner.c" line="990"/>
+        <location filename="../planner.c" line="1139"/>
         <source>Can&apos;t find gas %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="363"/>
+        <location filename="../planner.c" line="341"/>
         <source>Too many gas mixes</source>
         <translation type="unfinished"/>
     </message>
@@ -6059,147 +7811,163 @@ Maximum</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
-        <source>based on GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="564"/>
         <source>Subsurface dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="555"/>
+        <location filename="../planner.c" line="568"/>
         <source>depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
+        <location filename="../planner.c" line="574"/>
         <source>runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="561"/>
+        <location filename="../planner.c" line="571"/>
         <source>duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="564"/>
+        <location filename="../planner.c" line="526"/>
+        <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="../planner.c" line="552"/>
+        <source>based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="560"/>
+        <source>recreational mode based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="577"/>
         <source>gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="601"/>
+        <location filename="../planner.c" line="620"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="628"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="641"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="629"/>
+        <location filename="../planner.c" line="648"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="681"/>
         <source>%3.0f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="645"/>
-        <location filename="../planner.c" line="649"/>
+        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="688"/>
         <source>%3dmin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="709"/>
         <source>(SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="683"/>
+        <location filename="../planner.c" line="732"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="685"/>
+        <location filename="../planner.c" line="734"/>
         <source>Switch gas to %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="704"/>
+        <location filename="../planner.c" line="752"/>
         <source>CNS</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="754"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="710"/>
+        <location filename="../planner.c" line="758"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="712"/>
+        <location filename="../planner.c" line="760"/>
         <source>Gas consumption:</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../planner.c" line="542"/>
-        <location filename="../planner.c" line="732"/>
-        <location filename="../planner.c" line="737"/>
-        <location filename="../planner.c" line="762"/>
-        <location filename="../planner.c" line="772"/>
+        <location filename="../planner.c" line="780"/>
+        <location filename="../planner.c" line="785"/>
+        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="820"/>
         <source>Warning:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN 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="../planner.c" line="556"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="558"/>
+        <source>based on VPM-B at +%d conservatism</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="781"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="738"/>
+        <location filename="../planner.c" line="786"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="740"/>
+        <location filename="../planner.c" line="788"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="742"/>
+        <location filename="../planner.c" line="790"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="759"/>
+        <location filename="../planner.c" line="807"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="769"/>
+        <location filename="../planner.c" line="817"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="1085"/>
+        <location filename="../planner.c" line="1373"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
@@ -6346,203 +8114,381 @@ EADD: %d%s
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1201"/>
+        <source>RBT: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1204"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
-        <source>Tissue %.0fmin: %.0f%s
+        <location filename="../profile.c" line="1210"/>
+        <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1214"/>
+        <location filename="../profile.c" line="1216"/>
         <source>heartbeat: %d
 </source>
         <translation>פעימות לב %d</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1218"/>
         <source>bearing: %d
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1221"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1314"/>
+        <location filename="../profile.c" line="1316"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1318"/>
-        <location filename="../profile.c" line="1322"/>
-        <location filename="../profile.c" line="1326"/>
+        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1324"/>
+        <location filename="../profile.c" line="1328"/>
         <source>%s %sD:%.1f%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1330"/>
+        <location filename="../profile.c" line="1332"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1334"/>
+        <location filename="../profile.c" line="1336"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1338"/>
-        <location filename="../profile.c" line="1342"/>
+        <location filename="../profile.c" line="1340"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1351"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="298"/>
+        <location filename="../qthelper.cpp" line="309"/>
+        <source>%1km</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="311"/>
+        <source>%1m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="315"/>
+        <source>%1mi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="317"/>
+        <source>%1yd</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="853"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="301"/>
+        <location filename="../qthelper.cpp" line="856"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="460"/>
+        <location filename="../qthelper.cpp" line="1009"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 צלילות)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="465"/>
+        <location filename="../qthelper.cpp" line="1014"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 צלילה)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="22"/>
         <source>boat</source>
         <translation>ספינה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="22"/>
         <source>shore</source>
         <translation>חוף</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../datatrak.c" line="451"/>
+        <location filename="../dive.c" line="22"/>
         <source>drift</source>
         <translation>סחיפה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="23"/>
         <source>deep</source>
         <translation>עמוק</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="23"/>
         <source>cavern</source>
         <translation>מחילה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../datatrak.c" line="435"/>
+        <location filename="../dive.c" line="23"/>
         <source>ice</source>
         <translation>קרח</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../datatrak.c" line="437"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="447"/>
+        <location filename="../dive.c" line="24"/>
         <source>wreck</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../datatrak.c" line="433"/>
+        <location filename="../dive.c" line="24"/>
         <source>cave</source>
         <translation>מערה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="24"/>
         <source>altitude</source>
         <translation>גובה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="25"/>
         <source>pool</source>
         <translation>ברכה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="25"/>
         <source>lake</source>
         <translation>אגם</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../datatrak.c" line="449"/>
+        <location filename="../dive.c" line="25"/>
         <source>river</source>
         <translation>נחל</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../datatrak.c" line="431"/>
+        <location filename="../dive.c" line="26"/>
         <source>night</source>
         <translation>לילה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../datatrak.c" line="145"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="278"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="281"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="284"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="287"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="290"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="293"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="313"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="316"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="319"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="322"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="325"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="328"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="388"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="392"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="394"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="396"/>
+        <location filename="../dive.c" line="26"/>
         <source>fresh</source>
         <translation>fresh</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../datatrak.c" line="398"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="423"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="425"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="429"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="455"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="466"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="490"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="529"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="580"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="662"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="675"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="26"/>
         <source>student</source>
         <translation>תלמיד</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../datatrak.c" line="453"/>
+        <location filename="../dive.c" line="27"/>
         <source>photo</source>
         <translation>תצלום</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="27"/>
         <source>video</source>
         <translation>וידאו</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../datatrak.c" line="427"/>
+        <location filename="../dive.c" line="27"/>
         <source>instructor</source>
         <translation>מדריך</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="26"/>
+        <location filename="../datatrak.c" line="390"/>
+        <location filename="../dive.c" line="28"/>
         <source>deco</source>
         <translation>דקומפרסיה</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="30"/>
+        <location filename="../dive.c" line="32"/>
         <source>OC-gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="30"/>
+        <location filename="../dive.c" line="32"/>
         <source>diluent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="30"/>
+        <location filename="../dive.c" line="32"/>
         <location filename="../equipment.c" line="85"/>
+        <location filename="../planner.c" line="1369"/>
+        <location filename="../planner.c" line="1372"/>
         <source>oxygen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../dive.c" line="237"/>
+        <location filename="../dive.c" line="239"/>
         <source>ℓ</source>
         <translation type="unfinished"/>
     </message>
@@ -6592,575 +8538,577 @@ EADD: %d%s
         <translation>(שום צלילות)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Sun</source>
         <translation>ראשון</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Mon</source>
         <translation>שני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Tue</source>
         <translation>שלישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Wed</source>
         <translation>רביעי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Thu</source>
         <translation>חמישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Fri</source>
         <translation>שישי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Sat</source>
         <translation>שבת</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Jan</source>
         <translation>ינואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Feb</source>
         <translation>פבואר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Mar</source>
         <translation>מרץ</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Apr</source>
         <translation>אפריל</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>May</source>
         <translation>מאי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Jun</source>
         <translation>יוני</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Jul</source>
         <translation>יולי</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Aug</source>
         <translation>אוגוסט</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Sep</source>
         <translation>ספטמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Oct</source>
         <translation>אוקטובר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Nov</source>
         <translation>נובמבר</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Dec</source>
         <translation>דצמבר</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="111"/>
+        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../parse-xml.c" line="3182"/>
+        <location filename="../uemis-downloader.c" line="124"/>
         <source>unknown</source>
         <translation>לא ידוע</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="431"/>
+        <location filename="../uemis-downloader.c" line="455"/>
         <source>data</source>
         <translation>נתונים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="411"/>
+        <location filename="../uemis-downloader.c" line="435"/>
         <source>%s %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="24"/>
+        <location filename="../uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="25"/>
+        <location filename="../uemis-downloader.c" line="28"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
-and try again</source>
+and click Retry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="26"/>
+        <location filename="../uemis-downloader.c" line="29"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="452"/>
+        <location filename="../uemis-downloader.c" line="483"/>
         <source>divelog #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="454"/>
+        <location filename="../uemis-downloader.c" line="485"/>
         <source>divespot #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="456"/>
+        <location filename="../uemis-downloader.c" line="487"/>
         <source>details for #</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="650"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>wetsuit</source>
         <translation>חליפת צלילה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="650"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>semidry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="650"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>drysuit</source>
         <translation>חליפה יבשה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>shorty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>vest</source>
         <translation>אפוד</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>long john</source>
         <translation>לבנים ארוכים</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>jacket</source>
         <translation>ז&apos;קט</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>full suit</source>
         <translation>חליפה מלאה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>2 pcs full suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="652"/>
+        <location filename="../uemis-downloader.c" line="699"/>
         <source>membrane</source>
         <translation>ממברנה</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="853"/>
+        <location filename="../uemis-downloader.c" line="1064"/>
         <source>Initialise communication</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="855"/>
+        <location filename="../uemis-downloader.c" line="1067"/>
         <source>Uemis init failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="866"/>
+        <location filename="../uemis-downloader.c" line="1079"/>
         <source>Start download</source>
         <translation>התחל הורדה</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="189"/>
         <source>Safety stop violation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="198"/>
+        <location filename="../uemis.c" line="191"/>
         <source>Speed alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="194"/>
         <source>Speed warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="203"/>
+        <location filename="../uemis.c" line="196"/>
         <source>pO₂ green warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="199"/>
         <source>pO₂ ascend warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="208"/>
+        <location filename="../uemis.c" line="201"/>
         <source>pO₂ ascend alarm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="205"/>
         <source>Tank pressure info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="207"/>
         <source>RGT warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="209"/>
         <source>RGT alert</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="211"/>
         <source>Tank change suggested</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="213"/>
         <source>Depth limit exceeded</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="215"/>
         <source>Max deco time warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="217"/>
         <source>Dive time info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="219"/>
         <source>Dive time alert</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="221"/>
         <source>Marker</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="223"/>
         <source>No tank data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="225"/>
         <source>Low battery warning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis.c" line="234"/>
+        <location filename="../uemis.c" line="227"/>
         <source>Low battery alert</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="434"/>
-        <location filename="../save-html.c" line="517"/>
-        <location filename="../worldmap-save.c" line="106"/>
+        <location filename="../save-html.c" line="443"/>
+        <location filename="../save-html.c" line="527"/>
+        <location filename="../worldmap-save.c" line="108"/>
         <source>Can&apos;t open file %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="452"/>
+        <location filename="../save-html.c" line="462"/>
         <source>Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="453"/>
+        <location filename="../save-html.c" line="463"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="454"/>
+        <location filename="../save-html.c" line="464"/>
         <source>Time</source>
         <translation>זמן</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="455"/>
+        <location filename="../save-html.c" line="465"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="456"/>
+        <location filename="../save-html.c" line="466"/>
         <source>Air temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="457"/>
+        <location filename="../save-html.c" line="467"/>
         <source>Water temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="462"/>
+        <location filename="../save-html.c" line="472"/>
         <source>Statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="466"/>
+        <location filename="../save-html.c" line="476"/>
         <source>Rating</source>
         <translation>דירוג</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="467"/>
+        <location filename="../save-html.c" line="477"/>
         <source>Visibility</source>
         <translation>ראות</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="468"/>
+        <location filename="../save-html.c" line="478"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="458"/>
+        <location filename="../save-html.c" line="468"/>
         <source>Dives</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="459"/>
+        <location filename="../save-html.c" line="469"/>
         <source>Expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="460"/>
+        <location filename="../save-html.c" line="470"/>
         <source>Collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="461"/>
+        <location filename="../save-html.c" line="471"/>
         <source>Trips</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="463"/>
+        <location filename="../save-html.c" line="473"/>
         <source>Advanced search</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="469"/>
+        <location filename="../save-html.c" line="479"/>
         <source>Divemaster</source>
         <translation>מדריך צלילה</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="470"/>
+        <location filename="../save-html.c" line="480"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="471"/>
+        <location filename="../save-html.c" line="481"/>
         <source>Suit</source>
         <translation>חליפה</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="472"/>
+        <location filename="../save-html.c" line="482"/>
         <source>Tags</source>
         <translation>תגיות</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="473"/>
+        <location filename="../save-html.c" line="483"/>
         <source>Notes</source>
         <translation>הערות</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="474"/>
+        <location filename="../save-html.c" line="484"/>
         <source>Show more details</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="477"/>
+        <location filename="../save-html.c" line="487"/>
         <source>Yearly statistics</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="478"/>
+        <location filename="../save-html.c" line="488"/>
         <source>Year</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="479"/>
+        <location filename="../save-html.c" line="489"/>
         <source>Total time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="480"/>
+        <location filename="../save-html.c" line="490"/>
         <source>Average time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="481"/>
+        <location filename="../save-html.c" line="491"/>
         <source>Shortest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="482"/>
+        <location filename="../save-html.c" line="492"/>
         <source>Longest time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="483"/>
+        <location filename="../save-html.c" line="493"/>
         <source>Average depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="484"/>
+        <location filename="../save-html.c" line="494"/>
         <source>Min. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="485"/>
+        <location filename="../save-html.c" line="495"/>
         <source>Max. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="487"/>
+        <location filename="../save-html.c" line="497"/>
         <source>Min. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="488"/>
+        <location filename="../save-html.c" line="498"/>
         <source>Max. SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="489"/>
+        <location filename="../save-html.c" line="499"/>
         <source>Average temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="490"/>
+        <location filename="../save-html.c" line="500"/>
         <source>Min. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="491"/>
+        <location filename="../save-html.c" line="501"/>
         <source>Max. temp.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="492"/>
+        <location filename="../save-html.c" line="502"/>
         <source>Back to list</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="498"/>
+        <location filename="../save-html.c" line="508"/>
         <source>Dive equipment</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="501"/>
+        <location filename="../save-html.c" line="511"/>
         <source>Work pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="502"/>
+        <location filename="../save-html.c" line="512"/>
         <source>Start pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="503"/>
+        <location filename="../save-html.c" line="513"/>
         <source>End pressure</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="511"/>
+        <location filename="../save-html.c" line="521"/>
         <source>Dive status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="486"/>
+        <location filename="../save-html.c" line="496"/>
         <source>Average SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="495"/>
+        <location filename="../save-html.c" line="505"/>
         <source>Dive No.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="496"/>
+        <location filename="../save-html.c" line="506"/>
         <source>Dive profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="497"/>
+        <location filename="../save-html.c" line="507"/>
         <source>Dive information</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="499"/>
-        <location filename="../save-html.c" line="506"/>
+        <location filename="../save-html.c" line="509"/>
+        <location filename="../save-html.c" line="516"/>
         <source>Type</source>
         <translation>סוג</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="500"/>
+        <location filename="../save-html.c" line="510"/>
         <source>Size</source>
         <translation>גודל</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="504"/>
+        <location filename="../save-html.c" line="514"/>
         <source>Gas</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="505"/>
+        <location filename="../save-html.c" line="515"/>
         <source>Weight</source>
         <translation>משקל</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="507"/>
+        <location filename="../save-html.c" line="517"/>
         <source>Events</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="508"/>
+        <location filename="../save-html.c" line="518"/>
         <source>Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="509"/>
+        <location filename="../save-html.c" line="519"/>
         <source>Value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../save-html.c" line="510"/>
+        <location filename="../save-html.c" line="520"/>
         <source>Coordinates</source>
         <translation>קואורדינטות</translation>
     </message>
@@ -7190,216 +9138,449 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="46"/>
+        <location filename="../worldmap-save.c" line="47"/>
         <source>Air temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="48"/>
+        <location filename="../worldmap-save.c" line="50"/>
         <source>Water temp.:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="50"/>
+        <location filename="../worldmap-save.c" line="52"/>
         <source>Location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="54"/>
+        <location filename="../worldmap-save.c" line="56"/>
         <source>Notes:</source>
         <translation>הערות:</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="46"/>
-        <location filename="../qthelper.cpp" line="73"/>
+        <location filename="../qthelper.cpp" line="333"/>
+        <location filename="../qthelper.cpp" line="461"/>
         <source>N</source>
         <translation>צ</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="46"/>
-        <location filename="../qthelper.cpp" line="74"/>
+        <location filename="../qthelper.cpp" line="333"/>
+        <location filename="../qthelper.cpp" line="462"/>
         <source>S</source>
         <translation>ד</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="47"/>
-        <location filename="../qthelper.cpp" line="75"/>
+        <location filename="../qthelper.cpp" line="334"/>
+        <location filename="../qthelper.cpp" line="463"/>
         <source>E</source>
         <translation>מז</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="47"/>
-        <location filename="../qthelper.cpp" line="76"/>
+        <location filename="../qthelper.cpp" line="334"/>
+        <location filename="../qthelper.cpp" line="464"/>
         <source>W</source>
         <translation>מע</translation>
     </message>
+    <message>
+        <location filename="../git-access.c" line="206"/>
+        <location filename="../git-access.c" line="210"/>
+        <source>Remote storage and local data diverged. Error: can&apos;t get commit (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="208"/>
+        <source>Remote storage and local data diverged. Error: failed local tree lookup (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="212"/>
+        <source>Remote storage and local data diverged. Error: failed remote tree lookup (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="214"/>
+        <source>Remote storage and local data diverged. Error: can&apos;t get commit: (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="216"/>
+        <source>Remote storage and local data diverged. Error: failed base tree lookup: (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="218"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="247"/>
+        <source>Remote storage and local data diverged. Error: merge conflict - manual intervention needed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="255"/>
+        <source>Remote storage and local data diverged. Error: writing the tree failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="257"/>
+        <source>Remote storage and local data diverged. Error: tree lookup failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="259"/>
+        <source>Failed to get author: (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="261"/>
+        <source>Remote storage and local data diverged. Error: git commit create failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="263"/>
+        <source>Error: could not lookup the merge commit I just created (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="506"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="509"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../load-git.c" line="189"/>
+        <source>multiple gps locations for this dive site; also %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../load-git.c" line="216"/>
+        <location filename="../parse-xml.c" line="1302"/>
+        <source>additional name for site: %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../ostctools.c" line="122"/>
+        <location filename="../ostctools.c" line="154"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../ostctools.c" line="167"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../qt-mobile/main.qml" line="11"/>
+        <location filename="../qt-mobile/main.qml" line="96"/>
+        <source>Subsurface mobile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerDetails</name>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="14"/>
+        <location filename="../build/ui_plannerDetails.h" line="90"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="43"/>
+        <location filename="../build/ui_plannerDetails.h" line="91"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="59"/>
+        <location filename="../build/ui_plannerDetails.h" line="92"/>
+        <source>Print</source>
+        <translation>הדפס</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="92"/>
+        <location filename="../build/ui_plannerDetails.h" line="93"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>plannerSettingsWidget</name>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <location filename="../build/ui_plannerSettings.h" line="420"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="74"/>
+        <location filename="../build/ui_plannerSettings.h" line="421"/>
         <source>Rates</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="95"/>
+        <location filename="../build/ui_plannerSettings.h" line="422"/>
         <source>Ascent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="98"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="104"/>
+        <location filename="../build/ui_plannerSettings.h" line="423"/>
         <source>below 75% avg. depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="105"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="122"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="139"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="156"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="202"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="145"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="162"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="206"/>
+        <location filename="../build/ui_plannerSettings.h" line="424"/>
+        <location filename="../build/ui_plannerSettings.h" line="426"/>
+        <location filename="../build/ui_plannerSettings.h" line="428"/>
+        <location filename="../build/ui_plannerSettings.h" line="430"/>
+        <location filename="../build/ui_plannerSettings.h" line="432"/>
         <source>m/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="169"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="175"/>
+        <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="221"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="187"/>
+        <location filename="../build/ui_plannerSettings.h" line="433"/>
         <source>surface to the bottom</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="240"/>
+        <location filename="../build/ui_plannerSettings.h" line="434"/>
         <source>Planning</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
-        <source>GF low</source>
+        <location filename="../qt-ui/plannerSettings.ui" line="261"/>
+        <source>VPM-B deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="268"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <source>Buehlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="278"/>
+        <location filename="../build/ui_plannerSettings.h" line="445"/>
+        <source>Reserve gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="320"/>
+        <location filename="../build/ui_plannerSettings.h" line="449"/>
+        <source>Postpone gas change if a stop is not required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="323"/>
+        <location filename="../build/ui_plannerSettings.h" line="451"/>
+        <source>Only switch at required stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="343"/>
+        <location filename="../build/ui_plannerSettings.h" line="442"/>
+        <source>GF low</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="307"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
+        <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="../qt-ui/plannerSettings.ui" line="288"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../build/ui_plannerSettings.h" line="435"/>
         <source>GF high</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="426"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
         <source>Drop to first depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <location filename="../build/ui_plannerSettings.h" line="438"/>
         <source>Last stop at 6m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
         <source>Plan backgas breaks</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="512"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
         <source>Gas options</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="591"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
         <source>Bottom SAC</source>
         <translation>צריכת גז בעומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="689"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
         <source>Deco SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="598"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
         <source>Bottom pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="682"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
         <source>Deco pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="562"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="669"/>
+        <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="../qt-ui/plannerSettings.ui" line="478"/>
-        <source>Dive notes</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="629"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
         <source>Display runtime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="642"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
         <source>Display segment duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="652"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
         <source>Display transitions in deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="659"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
         <source>Verbatim dive plan</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="546"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="575"/>
+        <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="../qt-ui/plannerSettings.ui" line="115"/>
+        <location filename="../qt-ui/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="../qt-ui/plannerSettings.ui" line="132"/>
+        <location filename="../qt-ui/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="../qt-ui/plannerSettings.ui" line="149"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
         <source>6m to surface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>דקה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="396"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="433"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="456"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <source>Conservatism level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="605"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>הערות</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="626"/>
+        <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="../qt-ui/plannerSettings.ui" line="515"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="639"/>
+        <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="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="649"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation type="unfinished"/>
     </message>