Latest translation update

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

1 files changed, 3429 insertions, 1979 deletions

diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index d5a40b031..a110d8f9b 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -1,256 +1,284 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.1">
 <context>
+    <name>About</name>
+    <message>
+        <location filename="../mobile-widgets/qml/About.qml" line="10"/>
+        <location filename="../mobile-widgets/qml/About.qml" line="19"/>
+        <source>About Subsurface-mobile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/About.qml" line="36"/>
+        <source>A mobile version of the free Subsurface divelog software.
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/About.qml" line="37"/>
+        <source>View your dive logs while on the go.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/About.qml" line="48"/>
+        <source>Version: %1
+
+© Subsurface developer team
+2011-2016</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>BtDeviceSelectionDialog</name>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
         <source>Remote Bluetooth device selection</source>
         <translation>Избор на дистанционно Bluetooth устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="35"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <source>Discovered devices</source>
         <translation>Открити устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/>
         <source>Save</source>
         <translation>Запиши</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="54"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/>
         <source>Quit</source>
         <translation>Изход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="36"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/>
         <source>Scan</source>
         <translation>Сканирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
         <source>Clear</source>
         <translation>Изчисти</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Local Bluetooth device details</source>
         <translation>Детайли за локално Bluetooth устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="128"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/>
         <source>Name: </source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
         <source>Address:</source>
         <translation>Адрес:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="33"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <source>Bluetooth powered on</source>
         <translation>Bluetooth включен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="34"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
         <source>Turn on/off</source>
         <translation>Включи/изключи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
         <source>Select device:</source>
         <translation>Избери устройство:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="135"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
         <translation>Опит за включване нa Bluetooth устройство...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="138"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="137"/>
         <source>Trying to turn off the local Bluetooth device...</source>
         <translation>Опит за изключване нa Bluetooth устройство...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
         <translation>Сканиране на дистанционни устройства...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="193"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="192"/>
         <source>Scanning finished successfully.</source>
         <translation>Скиранирането приключи успешно.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="340"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="360"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
         <source>UNPAIRED</source>
         <translation>UNPAIRED</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="345"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="358"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="229"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="344"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="357"/>
         <source>PAIRED</source>
         <translation>PAIRED</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="233"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="350"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="359"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="358"/>
         <source>AUTHORIZED_PAIRED</source>
         <translation>AUTHORIZED_PAIRED</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="237"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/>
         <source>%1 (%2)   [State: %3]</source>
         <translation>%1 (%2)   [Статус: %3]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="254"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/>
         <source>The device %1 can be used for connection. You can press the Save button.</source>
         <translation>Устройството %1 може да бъде използвано за връзка. Може да натиснете бутона Зaпиши.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="263"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="376"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="262"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/>
         <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
         <translation>Устойството %1 трябва да бъде чифтосано за да бъде използвано. Моля използвайте контекст менюто за опции.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="287"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="286"/>
         <source>The local device was changed.</source>
         <translation>Локалното устройство бе променено.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="307"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="306"/>
         <source>Pair</source>
         <translation>Чифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
         <source>Device %1 was paired and is authorized.</source>
         <translation>Устроството %1 бе чифтосано и оторизирано.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="57"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
         <source>Could not initialize Winsock version 2.2</source>
         <translation>Winsock версия 2.2 не може да бъде стартиран.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
         <source>Remote devices list was cleared.</source>
         <translation>Списъка на дистанционни устройства бе изчиствен.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="209"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
         <source>The local Bluetooth device was %1.</source>
         <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
         <translation>Локалното Bluetooth устройство бе %1.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="210"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
         <source>turned on</source>
         <translation>включено</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="210"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
         <source>turned off</source>
         <translation>изключено</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="308"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
         <translation>Дистанционно чифтосване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="324"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
         <source>Trying to pair device %1</source>
         <translation>Опит за чифтосване на устройство %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="328"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="327"/>
         <source>Trying to unpair device %1</source>
         <translation>Опит за раз-чифтосване на устройство %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/>
         <source>Device %1 was unpaired.</source>
         <translation>Устройство %1 бе раз-чифтосано.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="348"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="347"/>
         <source>Device %1 was paired.</source>
         <translation>Устройство %1 бе чифтосано.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="379"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
         <translation>Устройството %1 може да бъде използвано за връзка. Може да натиснете бутона Запиши.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="391"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/>
         <source>Local device error: %1.</source>
         <translation>Грешка в локално устройство: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="392"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/>
         <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
         <translation>Грешка при чифтосване. Ако дистанционното устройство изисква PIN код, моля опитайте да чифтосате устройствата използвайки операционната система.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="394"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="393"/>
         <source>Unknown error</source>
         <translation>Непозната грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="403"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="402"/>
         <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
         <translation>Bluetooth адаптера е изключен, включете го преди да извършите откритието на устройството.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="406"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="405"/>
         <source>Writing to or reading from the device resulted in an error.</source>
         <translation>Грешка при четенето или записа на устройството.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="412"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/>
         <source>An unknown error has occurred.</source>
         <translation>Непозната грешка.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="417"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/>
         <source>Device discovery error: %1.</source>
         <translation>Грешка при откритие на устройството: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/>
         <source>Not available</source>
         <translation>Липсва</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="452"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="451"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
         <translation>Локалния Bluetooth адаптер е недостъпен.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="502"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="501"/>
         <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>Агента за открития на устройства не бе създаден, защото адреса %1 не пасва на физическия адрес на адаптера на нито едно локално Bluetooth устройство.</translation>
     </message>
@@ -258,12 +286,12 @@
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="612"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
         <source>Person: </source>
         <translation>Лице:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="613"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Търсене за партньори и водачи</translation>
     </message>
@@ -271,180 +299,203 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="233"/>
+        <location filename="../qt-models/filtermodels.cpp" line="243"/>
         <source>No buddies</source>
         <translation>Няма партньори</translation>
     </message>
 </context>
 <context>
+    <name>CloudCredentials</name>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+        <source>Cloud credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+        <source>Email</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+        <source>Show password</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>ColumnNameProvider</name>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Dive #</source>
         <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Cyl. size</source>
         <translation>Големина на бутилката</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="42"/>
         <source>Start pressure</source>
         <translation>Начално налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>End pressure</source>
         <translation>Крайно налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Air temp.</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Water temp.</source>
         <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Max. depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Avg. depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Sample time</source>
         <translation>Време на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Sample depth</source>
         <translation>Дълбочина на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Sample temperature</source>
         <translation>Температура на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Sample pO₂</source>
         <translation>pO₂ на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Sample CNS</source>
         <translation>CNS на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Sample NDL</source>
         <translation>NDL na проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Sample TTS</source>
         <translation>TTS на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Sample stopdepth</source>
         <translation>Дълбоч. стоп на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Sample pressure</source>
         <translation>Налягане на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Проба сензор1 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Проба сензор2 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Проба сензор3 pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="42"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/>
         <source>Sample setpoint</source>
         <translation>Сетпойнт проба</translation>
     </message>
@@ -452,42 +503,42 @@
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="220"/>
+        <location filename="../core/configuredivecomputer.cpp" line="220"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Не може да бъде записън бекъп файл %1. Грешка: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="236"/>
+        <location filename="../core/configuredivecomputer.cpp" line="236"/>
         <source>Could not open backup file: %1</source>
         <translation>Не може да бъде отворен бекъп файл: %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="584"/>
+        <location filename="../core/configuredivecomputer.cpp" line="584"/>
         <source>Dive computer details read successfully</source>
         <translation>Данни на гмуркачески компютър прочетени успешно</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="593"/>
+        <location filename="../core/configuredivecomputer.cpp" line="593"/>
         <source>Setting successfully written to device</source>
         <translation>Настройките успешно записани на устройството</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="602"/>
+        <location filename="../core/configuredivecomputer.cpp" line="602"/>
         <source>Device firmware successfully updated</source>
         <translation>Фърмуер успешно обновен</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="611"/>
+        <location filename="../core/configuredivecomputer.cpp" line="611"/>
         <source>Device settings successfully reset</source>
         <translation>Настройките успешно рестартирани</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="627"/>
+        <location filename="../core/configuredivecomputer.cpp" line="627"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="658"/>
+        <location filename="../core/configuredivecomputer.cpp" line="660"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Не може да се осъществи връзка с леководолазния компютър.</translation>
     </message>
@@ -495,56 +546,56 @@
 <context>
     <name>ConfigureDiveComputerDialog</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1518"/>
         <source>Configure dive computer</source>
         <translation>Настрой леководолазен комютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1519"/>
         <source>Device or mount point</source>
         <translation>Устройсто или входна точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="170"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="80"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/>
         <source>Retrieve available details</source>
         <translation>Изтегли детайли</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Запиши промени на устройство</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="119"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
         <translation>Бекъп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="129"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="129"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1530"/>
         <source>Restore backup</source>
         <translation>Върни бекъп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="139"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="139"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1531"/>
         <source>Update firmware</source>
         <translation>Обнови фърмуер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="177"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
@@ -555,9 +606,9 @@
         <translation>OSTC 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="253"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1419"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1795"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1561"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1937"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1616"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1764"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1781"/>
@@ -565,9 +616,9 @@
         <translation>Общи настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="297"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1514"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1811"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
@@ -575,9 +626,9 @@
         <translation>Сериен номер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="320"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1537"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1834"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
@@ -585,9 +636,9 @@
         <translation>Фърмуер версия</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="518"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1571"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1851"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
@@ -595,118 +646,118 @@
         <translation>Потребителски текс</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="337"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
         <source>Language</source>
         <translation>Език</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1552"/>
         <source>English</source>
         <translation>Английски</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="265"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="294"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1553"/>
         <source>German</source>
         <translation>Немски</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="270"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="299"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1554"/>
         <source>French</source>
         <translation>Френски</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="304"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1555"/>
         <source>Italian</source>
         <translation>Италиански</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="555"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
         <source>Dive mode</source>
         <translation>Режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
         <source>OC</source>
         <translation>OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="571"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="576"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2078"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
         <source>Gauge</source>
         <translation>Калибър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="581"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
         <source>Apnea</source>
         <translation>Апнеа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="385"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1979"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
         <source>Date format</source>
         <translation>Формат на датата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="348"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
         <source>MMDDYY</source>
         <translation>ММДДГГ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="353"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
         <source>DDMMYY</source>
         <translation>ДДММГГ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
         <source>YYMMDD</source>
         <translation>ГГММДД</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2199"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
         <source>Saturation</source>
         <translation>Сатурация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="425"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="710"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="733"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="759"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="811"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="877"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="903"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="985"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1001"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1308"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2020"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2124"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2150"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2176"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2216"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2239"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
@@ -725,392 +776,438 @@
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="749"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2003"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
         <source>Desaturation</source>
         <translation>Десатурация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="867"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2140"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
         <source>Last deco</source>
         <translation>Последна декомпресия</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2049"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
         <source> m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="395"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
         <source>Brightness</source>
         <translation>Яркост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="367"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
         <source>Eco</source>
         <translation>Еко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="372"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
         <source>Medium</source>
         <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="377"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
         <source>High</source>
         <translation>Високо</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="589"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1969"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
         <source>Sampling rate</source>
         <translation>Честота</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="600"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
         <source>2s</source>
         <translation>2сек.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1627"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="595"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1769"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
         <source>10s</source>
         <translation>10сек.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1708"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
         <source>Units</source>
         <translation>Единици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="284"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
         <source>m/°C</source>
         <translation>м/°C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="289"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
         <source>ft/°F</source>
         <translation>фута/°F</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="613"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
         <source>Dive mode color</source>
         <translation>Цветови режим</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="624"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1608"/>
         <source>Standard</source>
         <translation>Стандарт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="629"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="619"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1609"/>
         <source>Red</source>
         <translation>Червен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="634"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="624"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1610"/>
         <source>Green</source>
         <translation>Зелен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="629"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1611"/>
         <source>Blue</source>
         <translation>Син</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
         <source>Salinity (0-5%)</source>
         <translation>Соленост (0-5%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="647"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1903"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <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>Синхронизирай времето на Г.К. с PC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="508"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
         <source>Compass gain</source>
         <translation>Компас настройка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
         <source>Read settings from backup file or from device before writing to the device</source>
         <translation>Прочети настройки от бекъп файл или от устройството преди запис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="116"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
         <source>Read settings from backup file or from device before writing to a backup file</source>
         <translation>Прочети настройки от бекъп файл или от устройството преди запис на бекъп файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="232"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
         <source>OSTC, Mk.2/2N/2C</source>
         <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="442"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
         <source>230LSB/Gauss</source>
         <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="447"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
         <source>330LSB/Gauss</source>
         <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="452"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
         <source>390LSB/Gauss</source>
         <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="457"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
         <source>440LSB/Gauss</source>
         <translation>440LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="462"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
         <source>660LSB/Gauss</source>
         <translation>660LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="467"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
         <source>820LSB/Gauss</source>
         <translation>820LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="472"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
         <source>1090LSB/Gauss</source>
         <translation>1090LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="477"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
         <source>1370LSB/Gauss</source>
         <translation>1370LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="654"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1910"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
         <source>Show safety stop</source>
         <translation>Покажи безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
         <source>Reset device to default settings</source>
         <translation>Рестартирай настройки по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="682"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1996"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2254"/>
         <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>Alt GF може да бъде избран по водата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="223"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
         <source>Suunto Vyper family</source>
         <translation>Suunto Vyper Family</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1990"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
         <source>Advanced settings</source>
         <translation>Разширени настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="689"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2013"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1783"/>
         <source>Future TTS</source>
         <translation>Бъдещ TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="696"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="812"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1619"/>
         <source>Pressure sensor offset</source>
         <translation>Отклонение на датчика за налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="703"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="819"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2490"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1620"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1809"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="726"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2209"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="842"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1622"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1808"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="801"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2062"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1787"/>
         <source>Decotype</source>
         <translation>Тип декомпресия</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="827"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="943"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1629"/>
         <source> mbar</source>
         <translation>м.бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="857"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2111"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
         <source> min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="844"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2073"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1792"/>
         <source>ZH-L16</source>
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="47"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
         <source>Connect via Bluetooth</source>
         <translation>Вържи се чрез Bluetooth</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="163"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Запиши libdivecomputer регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="668"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+        <source>End Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+        <source> s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+        <source>Start Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+        <source>Reset Depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
         <source>Left button sensitivity</source>
         <translation>Чувствителност на левия бутон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="675"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
         <source>Always show ppO2</source>
         <translation>Винаги покажи ppO2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="849"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
         <source>ZH-L16+GF</source>
         <translation>ZH-L16+GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2166"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1802"/>
         <source>Alt GFLow</source>
         <translation>Alt GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="919"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2192"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1035"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2450"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1641"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1804"/>
         <source>Alt GFHigh</source>
         <translation>Alt GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
         <translation>Обърни екрана</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="943"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1059"/>
         <source>Right button sensitivity</source>
         <translation>Чувствителност на десния бутон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="957"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2255"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
         <translation>Графичен индикатор на скоростта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="971"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2294"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
         <translation>Консумация на долен газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="978"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2301"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1094"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2559"/>
         <source>Deco gas consumption</source>
         <translation>Деко газ консумация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2309"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
+        <source>Temperature sensor offset</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1172"/>
+        <source>°C</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2567"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1721"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1876"/>
         <source>Gas settings</source>
         <translation>Газ настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1098"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1183"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2357"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2442"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2700"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1647"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1670"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1814"/>
@@ -1119,10 +1216,10 @@
         <translation>%He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1103"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1188"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2447"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1330"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2620"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2705"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1649"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1672"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1816"/>
@@ -1131,12 +1228,12 @@
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1108"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1193"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1268"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2367"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2452"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2517"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1250"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1335"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1410"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2625"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2775"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1651"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1674"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1818"/>
@@ -1145,80 +1242,80 @@
         <translation>Промени дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1113"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2372"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1255"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2630"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1656"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1823"/>
         <source>Gas 1</source>
         <translation>Газ 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1118"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2377"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1260"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2635"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1658"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1825"/>
         <source>Gas 2</source>
         <translation>Газ 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1123"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2382"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1265"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2640"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1660"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1827"/>
         <source>Gas 3</source>
         <translation>Газ 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1128"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2387"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1270"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2645"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1662"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1829"/>
         <source>Gas 4</source>
         <translation>Газ 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1133"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2392"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1275"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2650"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1664"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1831"/>
         <source>Gas 5</source>
         <translation>Газ 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1198"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2457"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1340"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2715"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1679"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1846"/>
         <source>Dil 1</source>
         <translation>Dil 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1203"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2462"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1345"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2720"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1681"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1848"/>
         <source>Dil 2</source>
         <translation>Dil 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1208"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2467"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1350"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2725"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1683"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1850"/>
         <source>Dil 3</source>
         <translation>Dil 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1213"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2472"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1355"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2730"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1685"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1852"/>
         <source>Dil 4</source>
         <translation>Dil 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1218"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2477"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1360"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1687"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1854"/>
         <source>Dil 5</source>
@@ -1237,64 +1334,64 @@
         <translation>Промени дълбочина [м]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1273"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2522"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2780"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1865"/>
         <source>SP 1</source>
         <translation>SP 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1278"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2527"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1420"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2785"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1700"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1867"/>
         <source>SP 2</source>
         <translation>SP 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1283"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2532"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1425"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2790"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1702"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1869"/>
         <source>SP 3</source>
         <translation>SP 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1288"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1430"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1704"/>
         <source>SP 4</source>
         <translation>SP 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1293"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1435"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1706"/>
         <source>SP 5</source>
         <translation>SP 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1325"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
         <translation>Фиксиран сетпойнт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1330"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1714"/>
         <source>Sensor</source>
         <translation>Сензор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1338"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1480"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1716"/>
         <source>Setpoint fallback</source>
         <translation>Сетпойнт отстъпка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1361"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2553"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2569"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1503"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1519"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2811"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2827"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1717"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1718"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1872"/>
@@ -1303,81 +1400,81 @@
         <translation>сенти бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1606"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P1 (средно)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1611"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P2 (високо)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1650"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
         <source>Total dive time</source>
         <translation>Време на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1874"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
         <source>kg/ℓ</source>
         <translation>кг/л</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2088"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
         <source>Apnoea</source>
         <translation>Апнея</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1441"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
         <source>Safety level</source>
         <translation>Ниво на сугурност</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
         <source>Connect</source>
         <translation>Вържи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
         <source>Disconnect</source>
         <translation>Изключи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="214"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
         <source>OSTC 3,Sport,Cr,2</source>
         <translation>OSTC 3,Sport,Cr,2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="950"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
         <source>MOD warning</source>
         <translation>MOD предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="964"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
         <source>Dynamic ascent rate</source>
         <translation>Скорост на дънамично покачване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1017"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1033"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2262"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2278"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
         <source> ℓ/min</source>
         <translation>л/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1093"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1178"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2352"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2437"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
@@ -1386,284 +1483,284 @@
         <translation>%O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1263"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2512"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
         <source>Setpoint</source>
         <translation>Сетпойнт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1301"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
         <source>O₂ in calibration gas</source>
         <translation>O₂ в газ за настройка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1393"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2585"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1874"/>
         <source>pO₂ max</source>
         <translation>pO₂ макс</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1400"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2592"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1542"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2850"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1720"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1875"/>
         <source>pO₂ min</source>
         <translation>pO₂ мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1467"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
         <translation>Височинен диапазон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1474"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1616"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1724"/>
         <source>Model</source>
         <translation>Модел</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1494"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1936"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1636"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2013"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1725"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1778"/>
         <source>Number of dives</source>
         <translation>Брой гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1554"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1728"/>
         <source>Max depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1601"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1743"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1732"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P0 (няма)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1619"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
         <translation>Честота</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1632"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1774"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1740"/>
         <source>20s</source>
         <translation>20сек</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1637"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1779"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1741"/>
         <source>30s</source>
         <translation>30сек</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1642"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1784"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1742"/>
         <source>60s</source>
         <translation>60сек</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="541"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
         <source>Computer model</source>
         <translation>Модел на комютъра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1766"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1908"/>
         <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="1688"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1830"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1749"/>
         <source>24h</source>
         <translation>24ч</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1693"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1835"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1750"/>
         <source>12h</source>
         <translation>12ч</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1701"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1843"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1752"/>
         <source>Time format</source>
         <translation>Времеви формат</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1716"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1756"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1721"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1863"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1757"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1732"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1874"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1759"/>
         <source>s</source>
         <translation>сек</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1739"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1881"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1760"/>
         <source>Light</source>
         <translation>Светла</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1756"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1898"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1761"/>
         <source>Depth alarm</source>
         <translation>Дълбочинна аларма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1776"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1918"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1763"/>
         <source>Time alarm</source>
         <translation>Времева аларма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1801"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
         <source>Salinity</source>
         <translation>Соленост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1918"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
         <translation>ММ/ДД/ГГ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1923"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2079"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1775"/>
         <source>DD/MM/YY</source>
         <translation>ДД/ММ/ГГ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1928"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2084"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1776"/>
         <source>YY/MM/DD</source>
         <translation>ГГ/ММ/ДД</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2083"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2093"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
         <translation>L16-GF OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2098"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2356"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1797"/>
         <source>L16-GF CC</source>
         <translation>L16-GF CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2103"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2361"/>
         <location filename="../build/ui_configuredivecomputerdialog.h" line="1798"/>
         <source>PSCR-GF</source>
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1102"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
         <source>Backup files (*.xml)</source>
         <translation>Бекъп файлове (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1086"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Грешка при запис на бекъп файл.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1089"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
         <source>Backup succeeded</source>
         <translation>Бекъп успешен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1090"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Вашите настройки бяха записани в: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1080"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
         <source>Backup dive computer settings</source>
         <translation>Бекъп на настройки на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1085"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
         <source>XML backup error</source>
         <translation>XML бекъп грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1101"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
         <source>Restore dive computer settings</source>
         <translation>Върни настройки на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1107"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
         <source>XML restore error</source>
         <translation>Грешка при XML връщане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1108"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Настъпи грешка докато се връщаше бекъп файла.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1112"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
         <source>Restore succeeded</source>
         <translation>Връщане успешно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1113"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Вашите настройки бяха върнати успешно.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1123"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
         <source>Select firmware file</source>
         <translation>Изберете фърмуер файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1124"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
         <source>All files (*.*)</source>
         <translation>Всички файлове (*.*)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1180"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1181"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
@@ -1671,62 +1768,72 @@
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
         <translation>Работно налягане</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Start press.</source>
         <translation>Начално налягане</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>End press.</source>
         <translation>Крайно налягане</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="15"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Switch at</source>
         <translation>Превключи при</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="15"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Use</source>
         <translation>Използвaне</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="44"/>
+        <source>cuft</source>
+        <translation>кб.фута</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
+        <source>ℓ</source>
+        <translation>ℓ</translation>
+    </message>
+    <message>
+        <location filename="../qt-models/cylindermodel.cpp" line="161"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Кликнете тук за да изтриете бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="350"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="383"/>
         <source>Cylinder cannot be removed</source>
         <translation>Бутилката не може да бъде премахната</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="351"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="384"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation>
     </message>
@@ -1734,73 +1841,73 @@
 <context>
     <name>DiveComponentSelectionDialog</name>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="23"/>
         <location filename="../build/ui_divecomponentselection.h" line="139"/>
         <source>Component selection</source>
         <translation>Избор на компонент</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="52"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="52"/>
         <location filename="../build/ui_divecomponentselection.h" line="140"/>
         <source>Which components would you like to copy</source>
         <translation>Кои компоненти бихте желали да копирате</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="80"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
         <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="122"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
         <location filename="../build/ui_divecomponentselection.h" line="148"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="129"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
         <location filename="../build/ui_divecomponentselection.h" line="149"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="136"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
         <location filename="../build/ui_divecomponentselection.h" line="150"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="87"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
         <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="73"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
         <location filename="../build/ui_divecomponentselection.h" line="141"/>
         <source>Dive site</source>
         <translation>Място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="94"/>
+        <location filename="../desktop-widgets/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="101"/>
+        <location filename="../desktop-widgets/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="108"/>
+        <location filename="../desktop-widgets/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="115"/>
+        <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/>
         <location filename="../build/ui_divecomponentselection.h" line="147"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
@@ -1809,19 +1916,19 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
+        <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Изтриване на леководолазен компютър?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
         <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
         <source>Edit dive computer nicknames</source>
         <translation>Редактирай прякори на гмуркачерски комютри</translation>
@@ -1851,20 +1958,200 @@
     </message>
 </context>
 <context>
+    <name>DiveDetails</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+        <source>Dive details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+        <source>Delete dive</source>
+        <translation>Изтрий гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+        <source>Show on map</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DiveDetailsEdit</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+        <source>Dive %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+        <source>Date:</source>
+        <translation>Дата:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+        <source>Location:</source>
+        <translation>Местонахождение:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+        <source>Coordinates:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+        <source>Use current
+GPS location:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+        <source>Depth:</source>
+        <translation>Дълбочина:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+        <source>Duration:</source>
+        <translation>Продължителност:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+        <source>Air Temp:</source>
+        <translation>Темп. на въздух:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <source>Water Temp:</source>
+        <translation>Темп. на водата:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+        <source>Suit:</source>
+        <translation>Водолазен костюм:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+        <source>Buddy:</source>
+        <translation>Партньор:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+        <source>Dive Master:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+        <source>Weight:</source>
+        <translation>Тегло:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+        <source>Gas mix:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+        <source>Start Pressure:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+        <source>End Pressure:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+        <source>Notes:</source>
+        <translation>Бележки:</translation>
+    </message>
+</context>
+<context>
+    <name>DiveDetailsView</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
+        <source>Date: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
+        <source>Depth: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
+        <source>Duration: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
+        <source>No profile to show</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
+        <source>Dive Details</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
+        <source>Suit:</source>
+        <translation>Водолазен костюм:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+        <source>Air Temp:</source>
+        <translation>Темп. на въздух:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+        <source>Cylinder:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+        <source>Water Temp:</source>
+        <translation>Темп. на водата:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+        <source>Dive Master:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+        <source>Weight:</source>
+        <translation>Тегло:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+        <source>Buddy:</source>
+        <translation>Партньор:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+        <source>SAC:</source>
+        <translation>SAC:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+        <source>Notes</source>
+        <translation>Бележки</translation>
+    </message>
+</context>
+<context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="116"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
         <source>Manual switch to OC</source>
         <translation>Ръчно включване на OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="119"/>
+        <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> край</translation>
@@ -1873,125 +2160,155 @@
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="644"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
         <source>Date/time</source>
         <translation>Дата/време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="646"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="648"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="670"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
         <source>h:</source>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="670"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
 </context>
 <context>
+    <name>DiveList</name>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+        <source>Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
+        <source>Depth: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
+        <source>Duration: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+        <source>Cloud credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+        <source>Please tap the &apos;+&apos; button to add a dive</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="845"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
         <source>Expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="847"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
         <source>Collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="851"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
         <source>Collapse others</source>
         <translation>Свиване на други</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="855"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
         <source>Remove dive(s) from trip</source>
         <translation>Изтрий гмуркане (гмуркания) от пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="856"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
         <source>Create new trip above</source>
         <translation>Създай ново пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="870"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="872"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="876"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
         <source>Merge trip with trip above</source>
         <translation>Слей пътуване с горно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="877"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
         <source>Merge trip with trip below</source>
         <translation>Слей пътуване с долно пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="881"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
         <source>Delete dive(s)</source>
         <translation>Изтрий гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="883"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
         <source>Mark dive(s) invalid</source>
         <translation>Маркирай гмуркания (гмуркане) като невалидни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="887"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
         <source>Merge selected dives</source>
         <translation>Слей избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="889"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
         <source>Renumber dive(s)</source>
         <translation>Преномерирай гмуркане (гмуркания)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="890"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Shift dive times</source>
         <translation>Измести времена на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="891"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
         <source>Split selected dives</source>
         <translation>Рздели избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="892"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Load image(s) from file(s)</source>
         <translation>Зареди изображение(изображения) от файл(файлове).</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="893"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Load image(s) from web</source>
         <translation>Зареди изображение(изображения) от интернет</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="916"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
         <source>Open image files</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="916"/>
+        <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1999,12 +2316,12 @@
 <context>
     <name>DiveLocationModel</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="327"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="330"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
         <translation>Създай ново място на гмуркане и копирай информация от текущото гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="328"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="331"/>
         <source>Create a new dive site with this name</source>
         <translation>Създай ново място на гмуркане с име</translation>
     </message>
@@ -2012,330 +2329,330 @@
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="103"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
         <location filename="../build/ui_divelogexportdialog.h" line="351"/>
         <source>Export format</source>
         <translation>Експорт формат</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="134"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
         <location filename="../build/ui_divelogexportdialog.h" line="353"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="187"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
         <location filename="../build/ui_divelogexportdialog.h" line="358"/>
         <source>Worldmap</source>
         <translation>Световна карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="197"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
         <location filename="../build/ui_divelogexportdialog.h" line="359"/>
         <source>I&amp;mage depths</source>
         <translation>&amp;Дълбочина на изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="243"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
         <location filename="../build/ui_divelogexportdialog.h" line="360"/>
         <source>Selection</source>
         <translation>Селекция</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="346"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
         <location filename="../build/ui_divelogexportdialog.h" line="361"/>
         <location filename="../build/ui_divelogexportdialog.h" line="372"/>
         <source>Selected dives</source>
         <translation>Избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="262"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
         <location filename="../build/ui_divelogexportdialog.h" line="362"/>
         <source>All dives</source>
         <translation>Всички гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
         <location filename="../build/ui_divelogexportdialog.h" line="396"/>
         <source>HTML</source>
         <translation>HTML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
         <translation>Експортирай гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="44"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
         <location filename="../build/ui_divelogexportdialog.h" line="369"/>
         <source>General export</source>
         <translation>Общ експорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="115"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
         <location filename="../build/ui_divelogexportdialog.h" line="352"/>
         <source>Subsurface &amp;XML</source>
         <translation>Subsurface &amp;XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="147"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
         <location filename="../build/ui_divelogexportdialog.h" line="354"/>
         <source>di&amp;velogs.de</source>
         <translation>di&amp;velogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="157"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="157"/>
         <location filename="../build/ui_divelogexportdialog.h" line="355"/>
         <source>DiveShare</source>
         <translation>DiveShare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="167"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
         <location filename="../build/ui_divelogexportdialog.h" line="356"/>
         <source>CSV dive profile</source>
         <translation>CSV гмуркачески профил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="177"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
         <location filename="../build/ui_divelogexportdialog.h" line="357"/>
         <source>CSV dive details</source>
         <translation>CSV гмуркачески данни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
         <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>CSV гмуркачески единици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="288"/>
+        <location filename="../desktop-widgets/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="293"/>
+        <location filename="../desktop-widgets/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="324"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
         <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Общи настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="330"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
         <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Subsurface числа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="359"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
         <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Изтегли годишни статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="375"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
         <location filename="../build/ui_divelogexportdialog.h" line="374"/>
         <source>All di&amp;ves</source>
         <translation>Всички гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="385"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Експортирай само списъка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="392"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
         <location filename="../build/ui_divelogexportdialog.h" line="376"/>
         <source>Export photos</source>
         <translation>Експорт на снимки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="408"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
         <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Стилови настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="423"/>
+        <location filename="../desktop-widgets/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="433"/>
+        <location filename="../desktop-widgets/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="444"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
         <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="449"/>
+        <location filename="../desktop-widgets/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="454"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
         <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="459"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
         <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="464"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
         <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="469"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
         <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="474"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
         <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="482"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
         <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="493"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
         <location filename="../build/ui_divelogexportdialog.h" line="393"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="95"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
         <source>Light</source>
         <translation>Светла</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="498"/>
+        <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
         <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Пясък</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="149"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлове (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="157"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>CSV файлове (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Общ формат, който се използва за обмен на данни между различни видове програми.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Данни разделени със запетая, описващи гмуркаческия профил.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../desktop-widgets/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>Данни разделени със запетая описващи гмуркането. Това не включва информация за профила.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Изпрати данните от гмуркането към сайта divelogs.de.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Изпрати данните към сайта dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>HTML експорт на местонахождения, визуализирани на световната карта.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>Subsurface native XML format.</source>
         <translation>Subsurface XML формат</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Write depths of images to file.</source>
         <translation>Запиши дълбочините във файл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="148"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
         <source>Export UDDF file as</source>
         <translation>Експорт на като UDDF файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="152"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="156"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
         <source>Export CSV file as</source>
         <translation>Експорт на СSV файл като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
         <source>Export world map</source>
         <translation>Експорт на световна карта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="164"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="184"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлове (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
         <source>Export Subsurface XML</source>
         <translation>Експорт на Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="169"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>XML файлове (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
         <source>Save image depths</source>
         <translation>Запиши дълбочините</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="183"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
         <source>Export HTML files as</source>
         <translation>Експортирай HTML файлове като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="199"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
         <source>Please wait, exporting...</source>
         <translation>Моля изчакайте, експортиране...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="234"/>
+        <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
         <source>Can&apos;t open file %s</source>
         <translation>Не може да бъде отворен файл %s</translation>
     </message>
@@ -2343,345 +2660,356 @@
 <context>
     <name>DiveLogImportDialog</name>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="14"/>
         <location filename="../build/ui_divelogimportdialog.h" line="149"/>
         <source>Import dive log file</source>
         <translation>Вмъкни гмуркачески регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="780"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="127"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
         <location filename="../build/ui_divelogimportdialog.h" line="164"/>
         <source>Metric</source>
         <translation>Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="132"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
         <location filename="../build/ui_divelogimportdialog.h" line="165"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="89"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
         <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
         <translation>дд.мм.гггг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="94"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="94"/>
         <location filename="../build/ui_divelogimportdialog.h" line="153"/>
         <source>mm/dd/yyyy</source>
         <translation>дд/мм/гггг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="99"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="99"/>
         <location filename="../build/ui_divelogimportdialog.h" line="154"/>
         <source>yyyy-mm-dd</source>
         <translation>гггг-мм-дд</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="155"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
         <location filename="../build/ui_divelogimportdialog.h" line="167"/>
         <source>Drag the tags above to each corresponding column below</source>
         <translation>Може да завлечете таговете към определена колона долу</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="776"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
         <source>Dive #</source>
         <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="778"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="782"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="786"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="788"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
         <source>Max. depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="790"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
         <source>Avg. depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="796"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="609"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="802"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="598"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="818"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="820"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="108"/>
+        <location filename="../desktop-widgets/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="113"/>
+        <location filename="../desktop-widgets/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="118"/>
+        <location filename="../desktop-widgets/divelogimportdialog.ui" line="118"/>
         <location filename="../build/ui_divelogimportdialog.h" line="160"/>
         <source>Minutes:seconds</source>
         <translation>Минути:секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="784"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="342"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="469"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
         <source>Tab</source>
         <translation>Етикет</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="521"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Някой заглавия на колони бяха популирани. Моля завлечете ги за да паснат на колоната към която са.</translation>
     </message>
     <message>
-        <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"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="613"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
         <source>Sample time</source>
         <translation>Време на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="664"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="715"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
         <source>Sample depth</source>
         <translation>Дълбочина на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="666"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="717"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
         <source>Sample temperature</source>
         <translation>Температура на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="670"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="721"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Проба сензор1 pO₂</translation>
     </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"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Проба сензор2 pO₂</translation>
     </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"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Проба сензор3pO₂</translation>
     </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"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
         <source>Sample stopdepth</source>
         <translation>Дълбоч. стоп на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="686"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
         <source>Sample setpoint</source>
         <translation>Сетпойнт проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="668"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="719"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
         <source>Sample pO₂</source>
         <translation>pO₂ на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="573"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="676"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="727"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
         <source>Sample CNS</source>
         <translation>CNS на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="575"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="678"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="729"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
         <source>Sample NDL</source>
         <translation>NDL na проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="680"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="731"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
         <source>Sample TTS</source>
         <translation>TTS на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="684"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="735"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
         <source>Sample pressure</source>
         <translation>Налягане на проба</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="792"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="794"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="798"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="608"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="800"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="812"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
         <source>Cyl. size</source>
         <translation>Големина на бутилката</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="596"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="814"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
         <source>Start pressure</source>
         <translation>Начално налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="597"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="816"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
         <source>End pressure</source>
         <translation>Крайно налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="822"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
         <source>Air temp.</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="824"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
         <source>Water temp.</source>
         <translation>Темп. на водата</translation>
     </message>
 </context>
 <context>
+    <name>DiveObjectHelper</name>
+    <message>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+        <source>%1 dive(s)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DivePlanner</name>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="152"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
         <location filename="../build/ui_diveplanner.h" line="190"/>
         <source>Altitude</source>
         <translation>Височина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="109"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Планирано гмуркаческо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="159"/>
+        <location filename="../desktop-widgets/diveplanner.ui" line="159"/>
         <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
         <translation>АТМ налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="166"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/diveplanner.ui" line="179"/>
         <location filename="../build/ui_diveplanner.h" line="193"/>
         <source>mbar</source>
         <translation>м.бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="198"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/diveplanner.ui" line="220"/>
         <location filename="../build/ui_diveplanner.h" line="195"/>
         <source> kg/ℓ</source>
         <translation>кг/л</translation>
@@ -2695,27 +3023,27 @@
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="311"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
         <source>Final depth</source>
         <translation>Финална дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="313"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
         <source>Run time</source>
         <translation>Teчащо време</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="315"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="317"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
         <source>Used gas</source>
         <translation>Използван газ</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="319"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -2723,22 +3051,22 @@
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="108"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
         <source>Dive planner points</source>
         <translation>Точки в гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="112"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Available gases</source>
         <translation>Достъпни газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="137"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
         <source>Add dive data point</source>
         <translation>Добави точка в гмуркането</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="146"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
         <source>Save new</source>
         <translation>Запиши нов</translation>
     </message>
@@ -2746,112 +3074,112 @@
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="112"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
         <source>Pressure</source>
         <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
         <source>Color</source>
         <translation>Цвят</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure S</source>
         <translation>Налягане S</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Setpoint</source>
         <translation>Сетпойнт</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
         <source>Sensor 1</source>
         <translation>Сензор 1</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
         <source>Sensor 2</source>
         <translation>Сензор 2</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
         <source>Sensor 3</source>
         <translation>Сензор 3</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Heart rate</source>
         <translation>Сърдечен ритъм</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
         <source>Mean depth @ s</source>
         <translation>Средна дълбочина @ сек</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Ambient pressure</source>
         <translation>Околно налягане</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
         <translation>Градиент фактор</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Pressure I</source>
         <translation>Налягане I</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>User entered</source>
         <translation>Въведено от потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Cylinder index</source>
         <translation>Индекс на бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
         <source>Ceiling</source>
         <translation>Таван</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2859,55 +3187,55 @@
 <context>
     <name>DiveShareExportDialog</name>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/>
+        <location filename="../desktop-widgets/diveshareexportdialog.ui" line="14"/>
         <location filename="../build/ui_diveshareexportdialog.h" line="176"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="61"/>
+        <location filename="../desktop-widgets/diveshareexportdialog.ui" line="61"/>
         <location filename="../build/ui_diveshareexportdialog.h" line="177"/>
         <source>User ID</source>
         <translation>Потребителски ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="75"/>
+        <location filename="../desktop-widgets/diveshareexportdialog.ui" line="75"/>
         <location filename="../build/ui_diveshareexportdialog.h" line="181"/>
         <source>⌫</source>
         <translation>⌫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="82"/>
+        <location filename="../desktop-widgets/diveshareexportdialog.ui" line="82"/>
         <location filename="../build/ui_diveshareexportdialog.h" line="182"/>
         <source>Get user ID</source>
         <translation>Вземи потребителски ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="91"/>
+        <location filename="../desktop-widgets/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>&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; Ако не използвате UserID трябва да маркирате гмурканията си на ръка за да ги откриете отново.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="104"/>
+        <location filename="../desktop-widgets/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>Личните гмуркания няма да се появят в списъка &quot;подобни гмуркания&quot; и ще бъдат достъпни само ако тяхния URL е наличен.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="107"/>
+        <location filename="../desktop-widgets/diveshareexportdialog.ui" line="107"/>
         <location filename="../build/ui_diveshareexportdialog.h" line="187"/>
         <source>Keep dives private</source>
         <translation>Маркирай гмурканията като лични</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="129"/>
+        <location filename="../desktop-widgets/diveshareexportdialog.ui" line="129"/>
         <location filename="../build/ui_diveshareexportdialog.h" line="188"/>
         <source>Upload dive data</source>
         <translation>Качи данните за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="174"/>
+        <location filename="../desktop-widgets/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;
@@ -3052,97 +3380,112 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="163"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
         <source>no dives were selected</source>
         <translation>няма избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="182"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+        <source>stylesheet to export to divelogs.de is not found</source>
+        <translation>стиловете за експорт към divelogs.de не могат да бъдат намерени</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>не може да бъде създаден ZIP файл за качване: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="235"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
         <source>internal error</source>
         <translation>вътрешна грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="722"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="912"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+        <source>Conversion of dive %1 to divelogs.de format failed</source>
+        <translation>Конверсията на гмуркане %1 към формата на divelogs.de не може да бъде извършена</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+        <source>error writing zip file: %s zip error %d system error %d - %s</source>
+        <translation>грешка при писане на zip файл: %s zip грешка %d системна грешка %d - %s</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
         <source>Done</source>
         <translation>Готово</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="755"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
         <source>Uploading dive list...</source>
         <translation>Обновяване на списъка от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
         <source>Downloading dive list...</source>
         <translation>Изтегляне на списък от гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
         <source>Downloading %1 dives...</source>
         <translation>Изтегляне на %1 гмуркания...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
         <source>Download finished - %1</source>
         <translation>Изтеглянето приключи - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
         <source>Problem with download</source>
         <translation>Проблем при тегленето</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="877"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>The archive could not be opened:
 </source>
         <translation>Архива не може да бъде отворен:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="886"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
         <source>Corrupted download</source>
         <translation>Неправилно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="887"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Архива не може да бъде отворен:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="926"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
         <source>Upload failed</source>
         <translation>Грешка при качването</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="929"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
         <source>Upload successful</source>
         <translation>Успешно качване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="932"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
         <source>Login failed</source>
         <translation>Грешка при логин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
         <source>Cannot parse response</source>
         <translation>Не може да бъде направен разбор на отговора</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="946"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
         <source>Error: %1</source>
         <translation>Грешка: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="913"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
         <source>Upload finished</source>
         <translation>Качването приключи</translation>
     </message>
@@ -3150,57 +3493,57 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="185"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="436"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
         <source>Retry</source>
         <translation>Опитай пак</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="280"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
         <source>Find Uemis dive computer</source>
         <translation>Намери Uemis леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
         <source>Download</source>
         <translation>Изтегли</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="104"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Избери режим на Bluetooth теглене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="382"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Изберете регистър файл при изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="383"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
         <source>Log files (*.log)</source>
         <translation>Регистър файлове (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="398"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="399"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="410"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Изберете файл за libdivecomputer дъмп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="411"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
         <source>Dump files (*.bin)</source>
         <translation>Дъмп файлове (*.bin)</translation>
     </message>
@@ -3208,39 +3551,39 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
         <source>Vendor</source>
         <translation>Производител</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
         <translation>Изтегли от леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="266"/>
         <source>Device or mount point</source>
         <translation>Устройсто или входна точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="122"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
         <source>Choose Bluetooth download mode</source>
         <translation>Избери режим на Bluetooth теглене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
         <source>Dive computer</source>
         <translation>Леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../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="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
+        <location filename="../desktop-widgets/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"/>
@@ -3248,76 +3591,138 @@ p, li { white-space: pre-wrap; }
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../desktop-widgets/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="80"/>
+        <location filename="../desktop-widgets/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="129"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
         <translation>Избери дистанционно Bluetooth устройство.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
         <source>Download</source>
         <translation>Изтегли</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="226"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
         <translation>Изтеглени гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="236"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="236"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="279"/>
         <source>Select all</source>
         <translation>Селектирай всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="243"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="280"/>
         <source>Unselect all</source>
         <translation>Деселектирай всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Запиши libdivecomputer регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Запиши libdivecomputer дъмп файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
         <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
         <source>Download into new trip</source>
         <translation>Изтегли в ново пътуване</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
+        <source>Dive Computer</source>
+        <translation>Леководолазен компютър</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/>
+        <source> Vendor name : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
+        <source> Dive Computer:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
+        <source>Retry</source>
+        <translation>Опитай пак</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="60"/>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
+        <source>Quit</source>
+        <translation>Изход</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
+        <source> Downloaded dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
+        <source>Date / Time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
+        <source>Duration</source>
+        <translation>Продълж. (мин.)</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="89"/>
+        <source>Depth</source>
+        <translation>Дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/>
+        <source>Accept</source>
+        <translation>Приеми</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="111"/>
+        <source>Select All</source>
+        <translation>Селектирай всички</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
+        <source>Unselect All</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ExtraDataModel</name>
@@ -3333,24 +3738,47 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
+    <name>FacebookConnectWidget</name>
+    <message>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="14"/>
+        <source>Preferences</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/>
+        <source>Connect to facebook text placeholder</source>
+        <translation>Свързване с Facebook текст контейнер</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+        <source>To disconnect Subsurface from your Facebook account, use the button below</source>
+        <translation>За да прекъснете връзката на Subsurface с вашия Facebook акаунт, моля натиснете бутона по-долу.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+        <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
+        <translation>За да се свържете с Facebook, моля въведете потребител и парола. Това позволява на Subsurface да публикува гмуркания на вашия таймлайн.</translation>
+    </message>
+</context>
+<context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="259"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
         <source>Photo upload sucessfull</source>
         <translation>Успешно качване на снимка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="260"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Гмуркаческия профил бе качен във Facebook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="264"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
         <source>Photo upload failed</source>
         <translation>Грешка при качването на снимката</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="265"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -3360,21 +3788,29 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
+    <name>FacebookPlugin</name>
+    <message>
+        <location filename="../desktop-widgets/plugins/facebook/facebook_integration.cpp" line="36"/>
+        <source>Facebook</source>
+        <translation>Facebook</translation>
+    </message>
+</context>
+<context>
     <name>FilterWidget</name>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="14"/>
+        <location filename="../desktop-widgets/listfilter.ui" line="14"/>
         <location filename="../build/ui_listfilter.h" line="74"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="40"/>
+        <location filename="../desktop-widgets/listfilter.ui" line="40"/>
         <location filename="../build/ui_listfilter.h" line="75"/>
         <source>Text label</source>
         <translation>Текстов етикет</translation>
     </message>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="50"/>
+        <location filename="../desktop-widgets/listfilter.ui" line="50"/>
         <location filename="../build/ui_listfilter.h" line="76"/>
         <source>Filter this list</source>
         <translation>Филтрирай списъка</translation>
@@ -3383,19 +3819,19 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FilterWidget2</name>
     <message>
-        <location filename="../qt-ui/filterwidget.ui" line="73"/>
+        <location filename="../desktop-widgets/filterwidget.ui" line="73"/>
         <location filename="../build/ui_filterwidget.h" line="118"/>
         <source>Reset filters</source>
         <translation>Изчисти филтрите</translation>
     </message>
     <message>
-        <location filename="../qt-ui/filterwidget.ui" line="87"/>
+        <location filename="../desktop-widgets/filterwidget.ui" line="87"/>
         <location filename="../build/ui_filterwidget.h" line="121"/>
         <source>Show/hide filters</source>
         <translation>Покажи/скрий филтрите</translation>
     </message>
     <message>
-        <location filename="../qt-ui/filterwidget.ui" line="101"/>
+        <location filename="../desktop-widgets/filterwidget.ui" line="101"/>
         <location filename="../build/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation>Затвори и изчисти филтрите</translation>
@@ -3404,12 +3840,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1733"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1738"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
         <source>Firmware update failed!</source>
         <translation>Фърмуера не може да бъде обновен!</translation>
     </message>
@@ -3417,20 +3853,61 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="124"/>
+        <location filename="../desktop-widgets/globe.cpp" line="124"/>
         <source>Edit selected dive locations</source>
         <translation>Редактирай избраните местонахождения</translation>
     </message>
 </context>
 <context>
+    <name>GpsList</name>
+    <message>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/>
+        <source>GPS Fixes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+        <source>Date: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+        <source>Name: </source>
+        <translation>Име:</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+        <source>Latitude: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+        <source>Longitude: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+        <source>List of stored GPS fixes</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>GpsLocation</name>
+    <message>
+        <location filename="../core/gpslocation.cpp" line="121"/>
+        <source>Unknown GPS location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KMessageWidget</name>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="90"/>
+        <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/>
         <source>&amp;Close</source>
         <translation>&amp;Затвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="91"/>
+        <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/>
         <source>Close message</source>
         <translation>Затвори съобщение</translation>
     </message>
@@ -3438,7 +3915,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="639"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
         <source>Location: </source>
         <translation>Местонахождение: </translation>
     </message>
@@ -3446,32 +3923,32 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterDelegate</name>
     <message>
-        <location filename="../qt-ui/modeldelegates.cpp" line="540"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="497"/>
         <source> (same GPS fix)</source>
         <translation> (същия GPS фикс)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/modeldelegates.cpp" line="545"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/>
         <source> (~%1 away</source>
         <translation> (~%1 надалеч</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/modeldelegates.cpp" line="546"/>
-        <source>, %1 dive(s) here)</source>
-        <translation>, %1 гнумркане(гмуркания) тук)</translation>
+    <message numerus="yes">
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/>
+        <source>, %n dive(s) here)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../qt-ui/modeldelegates.cpp" line="551"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
         <translation>(няма GPS данни. добави GPS фикс от текущото гмуркане)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/modeldelegates.cpp" line="553"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="510"/>
         <source>(no GPS data)</source>
         <translation>(няма GPS данни)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/modeldelegates.cpp" line="555"/>
+        <location filename="../desktop-widgets/modeldelegates.cpp" line="512"/>
         <source>Pick site: </source>
         <translation>Избери място:</translation>
     </message>
@@ -3479,7 +3956,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="286"/>
+        <location filename="../qt-models/filtermodels.cpp" line="299"/>
         <source>No location set</source>
         <translation>Няма зададено местонахождение</translation>
     </message>
@@ -3487,52 +3964,52 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationInformation</name>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="14"/>
+        <location filename="../desktop-widgets/locationInformation.ui" line="14"/>
         <location filename="../build/ui_locationInformation.h" line="111"/>
         <source>GroupBox</source>
         <translation>GroupBox</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="29"/>
+        <location filename="../desktop-widgets/locationInformation.ui" line="29"/>
         <location filename="../build/ui_locationInformation.h" line="113"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="36"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/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="../desktop-widgets/locationInformation.ui" line="53"/>
         <location filename="../build/ui_locationInformation.h" line="114"/>
         <source>Coordinates</source>
         <translation>Координати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="69"/>
+        <location filename="../desktop-widgets/locationInformation.ui" line="69"/>
         <source>Reverse geo lookup</source>
         <translation>Обратно гео търсене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="72"/>
+        <location filename="../desktop-widgets/locationInformation.ui" line="72"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="93"/>
+        <location filename="../desktop-widgets/locationInformation.ui" line="93"/>
         <source>Dive sites on same coordinates</source>
         <translation>Места за гмуркане със същите координати.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationInformation.ui" line="131"/>
+        <location filename="../desktop-widgets/locationInformation.ui" line="131"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
@@ -3545,7 +4022,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationInformationModel</name>
     <message>
-        <location filename="../qt-models/divelocationmodel.cpp" line="67"/>
+        <location filename="../qt-models/divelocationmodel.cpp" line="68"/>
         <source>Create dive site with this name</source>
         <translation>Създай ново място на гмуркане с име</translation>
     </message>
@@ -3553,469 +4030,491 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>LocationInformationWidget</name>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="25"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="25"/>
         <source>Apply changes</source>
         <translation>Направи промените</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="28"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="28"/>
         <source>Discard changes</source>
         <translation>Отмени промените</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="31"/>
-        <location filename="../qt-ui/locationinformation.cpp" line="217"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="31"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
         <translation>Редакция на мяста за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="63"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="63"/>
         <source>Merge into current site</source>
         <translation>Смеси с текущото място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="72"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="72"/>
         <source>Merging dive sites</source>
         <translation>Смесване на места за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="73"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="73"/>
         <source>You are about to merge dive sites, you can't undo that action 
  Are you sure you want to continue?</source>
         <translation>Вие ще смесите места за гмуркане и това действие на може да бъде възвърнато
 Сигурни ли сте че искате да продължите?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/locationinformation.cpp" line="224"/>
+        <location filename="../desktop-widgets/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
         <translation>Вие редактирате място за гмуркане</translation>
     </message>
 </context>
 <context>
+    <name>Log</name>
+    <message>
+        <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
+        <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
+        <source>Application Log</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainForm.ui</name>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
+        <source>Press Me 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
+        <source>Press Me 2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>MainTab</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../desktop-widgets/maintab.ui" line="184"/>
         <location filename="../build/ui_maintab.h" line="951"/>
-        <location filename="../qt-ui/maintab.cpp" line="568"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="570"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="252"/>
+        <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="262"/>
+        <location filename="../desktop-widgets/maintab.ui" line="262"/>
         <location filename="../build/ui_maintab.h" line="955"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="387"/>
+        <location filename="../desktop-widgets/maintab.ui" line="387"/>
         <location filename="../build/ui_maintab.h" line="959"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="308"/>
+        <location filename="../desktop-widgets/maintab.ui" line="308"/>
         <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="321"/>
+        <location filename="../desktop-widgets/maintab.ui" line="321"/>
         <location filename="../build/ui_maintab.h" line="957"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="328"/>
+        <location filename="../desktop-widgets/maintab.ui" line="328"/>
         <location filename="../build/ui_maintab.h" line="958"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="397"/>
+        <location filename="../desktop-widgets/maintab.ui" line="397"/>
         <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="112"/>
-        <location filename="../qt-ui/maintab.ui" line="836"/>
+        <location filename="../desktop-widgets/maintab.ui" line="112"/>
+        <location filename="../desktop-widgets/maintab.ui" line="836"/>
         <location filename="../build/ui_maintab.h" line="949"/>
         <location filename="../build/ui_maintab.h" line="987"/>
-        <location filename="../qt-ui/maintab.cpp" line="310"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="306"/>
         <source>Air temp.</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="122"/>
-        <location filename="../qt-ui/maintab.ui" line="855"/>
+        <location filename="../desktop-widgets/maintab.ui" line="122"/>
+        <location filename="../desktop-widgets/maintab.ui" line="855"/>
         <location filename="../build/ui_maintab.h" line="950"/>
         <location filename="../build/ui_maintab.h" line="989"/>
-        <location filename="../qt-ui/maintab.cpp" line="311"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="307"/>
         <source>Water temp.</source>
         <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.ui" line="439"/>
+        <location filename="../desktop-widgets/maintab.ui" line="18"/>
+        <location filename="../desktop-widgets/maintab.ui" line="439"/>
         <location filename="../build/ui_maintab.h" line="961"/>
         <location filename="../build/ui_maintab.h" line="963"/>
-        <location filename="../qt-ui/maintab.cpp" line="540"/>
-        <location filename="../qt-ui/maintab.cpp" line="569"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="571"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../desktop-widgets/maintab.ui" line="21"/>
         <location filename="../build/ui_maintab.h" line="964"/>
         <source>General notes about the current selection</source>
         <translation>Общи бележки за текущия избор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <location filename="../desktop-widgets/maintab.ui" line="214"/>
         <source>Edit dive site</source>
         <translation>Редакция на място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../desktop-widgets/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="491"/>
+        <location filename="../desktop-widgets/maintab.ui" line="491"/>
         <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
         <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="494"/>
+        <location filename="../desktop-widgets/maintab.ui" line="494"/>
         <location filename="../build/ui_maintab.h" line="966"/>
         <source>Used equipment in the current selection</source>
         <translation>Използвана екипировка в текущия избор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="586"/>
+        <location filename="../desktop-widgets/maintab.ui" line="586"/>
         <location filename="../build/ui_maintab.h" line="994"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="589"/>
+        <location filename="../desktop-widgets/maintab.ui" line="589"/>
         <location filename="../build/ui_maintab.h" line="995"/>
         <source>Dive information</source>
         <translation>Информация за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="684"/>
+        <location filename="../desktop-widgets/maintab.ui" line="684"/>
         <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
         <translation>Използвани газове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../desktop-widgets/maintab.ui" line="703"/>
         <location filename="../build/ui_maintab.h" line="973"/>
         <source>Gas consumed</source>
         <translation>Консумиран газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="741"/>
+        <location filename="../desktop-widgets/maintab.ui" line="741"/>
         <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="779"/>
+        <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="817"/>
+        <location filename="../desktop-widgets/maintab.ui" line="817"/>
         <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
         <translation>Атмосф. налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="874"/>
+        <location filename="../desktop-widgets/maintab.ui" line="874"/>
         <location filename="../build/ui_maintab.h" line="991"/>
         <source>Dive time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="933"/>
+        <location filename="../desktop-widgets/maintab.ui" line="933"/>
         <location filename="../build/ui_maintab.h" line="1007"/>
         <source>Simple statistics about the selection</source>
         <translation>Прости статистики за избора</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1039"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1039"/>
         <location filename="../build/ui_maintab.h" line="999"/>
         <source>Total time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1106"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1106"/>
         <location filename="../build/ui_maintab.h" line="1004"/>
         <source>Gas consumption</source>
         <translation>Консумация на газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1151"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1151"/>
         <location filename="../build/ui_maintab.h" line="1009"/>
         <source>All photos from the current selection</source>
         <translation>Всички снимки от текущия избор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1177"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1177"/>
         <location filename="../build/ui_maintab.h" line="1010"/>
         <source>Extra data</source>
         <translation>Допълнителни данни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1180"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1180"/>
         <location filename="../build/ui_maintab.h" line="1011"/>
         <source>Adittional data from the dive computer</source>
         <translation>Допълнителни данни от текущия гмуркачески комютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="92"/>
-        <location filename="../qt-ui/maintab.ui" line="646"/>
+        <location filename="../desktop-widgets/maintab.ui" line="92"/>
+        <location filename="../desktop-widgets/maintab.ui" line="646"/>
         <location filename="../build/ui_maintab.h" line="947"/>
         <location filename="../build/ui_maintab.h" line="967"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../desktop-widgets/maintab.ui" line="102"/>
         <location filename="../build/ui_maintab.h" line="948"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="665"/>
+        <location filename="../desktop-widgets/maintab.ui" line="665"/>
         <location filename="../build/ui_maintab.h" line="969"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="722"/>
-        <location filename="../qt-ui/maintab.ui" line="1094"/>
+        <location filename="../desktop-widgets/maintab.ui" line="722"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1094"/>
         <location filename="../build/ui_maintab.h" line="975"/>
         <location filename="../build/ui_maintab.h" line="1003"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="798"/>
+        <location filename="../desktop-widgets/maintab.ui" line="798"/>
         <location filename="../build/ui_maintab.h" line="983"/>
         <source>Avg. depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="760"/>
+        <location filename="../desktop-widgets/maintab.ui" line="760"/>
         <location filename="../build/ui_maintab.h" line="979"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="893"/>
+        <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
         <translation>Соленост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="930"/>
+        <location filename="../desktop-widgets/maintab.ui" line="930"/>
         <location filename="../build/ui_maintab.h" line="1006"/>
         <source>Stats</source>
         <translation>Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="986"/>
+        <location filename="../desktop-widgets/maintab.ui" line="986"/>
         <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1027"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1027"/>
         <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="998"/>
+        <location filename="../desktop-widgets/maintab.ui" line="998"/>
         <location filename="../build/ui_maintab.h" line="997"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1058"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1058"/>
         <location filename="../build/ui_maintab.h" line="1001"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="1148"/>
+        <location filename="../desktop-widgets/maintab.ui" line="1148"/>
         <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Снимки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="89"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="88"/>
         <source>Cylinders</source>
         <translation>Бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="93"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="92"/>
         <source>Weights</source>
         <translation>Тежести</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="64"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="63"/>
         <source>Apply changes</source>
         <translation>Направи промените</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="68"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="67"/>
         <source>Discard changes</source>
         <translation>Отмени промените</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="90"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
         <translation>Добави бутилка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="94"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
         <translation>Добави система за тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>OC</source>
         <translation>OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>Freedive</source>
-        <translation type="unfinished"/>
+        <translation>Свободно гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="307"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="303"/>
         <source>Air temp. [%1]</source>
         <translation>Tемп. на въздуха [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="308"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="304"/>
         <source>Water temp. [%1]</source>
         <translation>Темп. на водата [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="347"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="343"/>
         <source>This trip is being edited.</source>
         <translation>Това пътуване се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="354"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="350"/>
         <source>Multiple dives are being edited.</source>
         <translation>Редактира се повече от едно гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="356"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="352"/>
         <source>This dive is being edited.</source>
         <translation>Това гмуркане се редактира.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="505"/>
-        <location filename="../qt-ui/maintab.cpp" line="535"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="501"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="534"/>
         <source>Trip notes</source>
         <translation>Бележки за пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="530"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="529"/>
         <source>Trip location</source>
         <translation>Местонахождение на пътуване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="606"/>
-        <location filename="../qt-ui/maintab.cpp" line="642"/>
-        <location filename="../qt-ui/maintab.cpp" line="646"/>
-        <location filename="../qt-ui/maintab.cpp" line="650"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="608"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="644"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="648"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="652"/>
         <source>/min</source>
         <translation>/м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="639"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="641"/>
         <source>Deepest dive</source>
         <translation>Най-дълбоко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="640"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="642"/>
         <source>Shallowest dive</source>
         <translation>Най-плитко гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="653"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="655"/>
         <source>Highest total SAC of a dive</source>
         <translation>Най-висок SAC на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="654"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="656"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Най-нисък SAC на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="655"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="657"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Среден SAC на всички избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="666"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="668"/>
         <source>Highest temperature</source>
         <translation>Най-висока температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="667"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="669"/>
         <source>Lowest temperature</source>
         <translation>Най-ниска температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="668"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="670"/>
         <source>Average temperature of all selected dives</source>
         <translation>Средна температура на всички избрани гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="678"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="683"/>
         <source>Longest dive</source>
         <translation>Най-дълго гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="679"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="684"/>
         <source>Shortest dive</source>
         <translation>Най-късо гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="680"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="685"/>
         <source>Average length of all selected dives</source>
         <translation>Средна дължина на избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="704"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="709"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -4024,812 +4523,852 @@ mixed from Air and using:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="708"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="713"/>
         <source> and </source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="838"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="843"/>
         <source>New dive site</source>
         <translation>Ново място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1132"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="1139"/>
         <source>Discard the changes?</source>
         <translation>Изтрий промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="1133"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="1140"/>
         <source>You are about to discard your changes.</source>
         <translation>Вие ще изтриете промените.</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
+        <source>Deleting Images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
+        <source>Are you sure you want to delete all images?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
+        <source>Load image(s) from file(s)</source>
+        <translation>Зареди изображение(изображения) от файл(файлове).</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="1654"/>
+        <source>Load image(s) from web</source>
+        <translation>Зареди изображение(изображения) от интернет</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
+        <source>Delete selected images</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
+        <source>Delete all images</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="61"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="61"/>
         <location filename="../build/ui_mainwindow.h" line="568"/>
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="454"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
         <location filename="../build/ui_mainwindow.h" line="534"/>
         <source>Export dive logs</source>
         <translation>Експорт на гмуркачески регистри</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
         <location filename="../build/ui_mainwindow.h" line="542"/>
         <source>Toggle pHe graph</source>
         <translation>Превключи pHе диаграма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="545"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
         <location filename="../build/ui_mainwindow.h" line="545"/>
         <source>Toggle calculating all tissues</source>
         <translation>Превключи калкулация на всички тъкани</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="521"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
         <location filename="../build/ui_mainwindow.h" line="543"/>
         <source>Toggle DC reported ceiling</source>
         <translation>Превключи отчетен таван на гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="533"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
         <location filename="../build/ui_mainwindow.h" line="544"/>
         <source>Toggle calculated ceiling</source>
         <translation>Превключи калкулиран таван</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="605"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
         <location filename="../build/ui_mainwindow.h" line="550"/>
         <source>Toggle NDL, TTS</source>
         <translation>Превключи NDL. TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="557"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
         <location filename="../build/ui_mainwindow.h" line="546"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation>Превключи калкулиран таван с 3м нарастване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="462"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
         <location filename="../build/ui_mainwindow.h" line="537"/>
         <source>Configure &amp;dive computer</source>
         <translation>Настрой &amp;леководолазен комютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="569"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
         <location filename="../build/ui_mainwindow.h" line="547"/>
         <source>Toggle heart rate</source>
         <translation>Превключи показване на пулс</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="581"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
         <location filename="../build/ui_mainwindow.h" line="548"/>
         <source>Toggle MOD</source>
         <translation>Превключи MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
         <location filename="../build/ui_mainwindow.h" line="549"/>
         <source>Toggle EAD, END, EADD</source>
         <translation>Превключи EAD, END, EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="617"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
         <location filename="../build/ui_mainwindow.h" line="551"/>
         <source>Toggle SAC rate</source>
         <translation>Превключи SAC скорост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
         <location filename="../build/ui_mainwindow.h" line="552"/>
         <source>Toggle ruler</source>
         <translation>Превключи линеал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="86"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
         <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>&amp;Регистър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="103"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
         <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>&amp;Изглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="119"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
         <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
         <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>&amp;Вмъкване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="137"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
         <location filename="../build/ui_mainwindow.h" line="573"/>
         <source>&amp;Edit</source>
         <translation>&amp;Редактирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="142"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
         <source>Share on</source>
         <translation>Сподели на</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="157"/>
+        <location filename="../desktop-widgets/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="160"/>
+        <location filename="../desktop-widgets/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="163"/>
+        <location filename="../desktop-widgets/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="168"/>
+        <location filename="../desktop-widgets/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="171"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
         <location filename="../build/ui_mainwindow.h" line="460"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="407"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="174"/>
+        <location filename="../desktop-widgets/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="179"/>
+        <location filename="../desktop-widgets/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="182"/>
+        <location filename="../desktop-widgets/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="185"/>
+        <location filename="../desktop-widgets/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="190"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
         <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>З&amp;апиши като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="193"/>
+        <location filename="../desktop-widgets/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="196"/>
+        <location filename="../desktop-widgets/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="201"/>
+        <location filename="../desktop-widgets/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="204"/>
+        <location filename="../desktop-widgets/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="207"/>
+        <location filename="../desktop-widgets/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="220"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
         <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>На&amp;стройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="250"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
         <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Вмъкни &amp;GPS данни от Subsurface уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
         <location filename="../build/ui_mainwindow.h" line="488"/>
         <source>Edit device &amp;names</source>
         <translation>&amp;Редактирай имена на устройства</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="271"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
         <location filename="../build/ui_mainwindow.h" line="491"/>
         <source>&amp;Edit dive</source>
         <translation>§Редактиране на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="276"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
         <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>&amp;Копирай компоненти на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="279"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
         <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="284"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
         <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>&amp;Залепи компоненти на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="287"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
         <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="324"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
         <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>&amp;Профил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
         <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>&amp;Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="340"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
         <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>&amp;Всички</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="356"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
         <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>&amp;Следващ ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="364"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
         <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>&amp;За Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="380"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
         <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>&amp;Глобус</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="402"/>
+        <location filename="../desktop-widgets/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="407"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
         <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>&amp;Вмъкни от divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
         <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>&amp;Цял екран</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="418"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
         <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Превключи цял екран</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="446"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
         <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>&amp;Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="451"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
         <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>&amp;Експорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="457"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
         <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="465"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
         <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="473"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
         <location filename="../build/ui_mainwindow.h" line="539"/>
         <source>Edit &amp;dive in planner</source>
         <translation>Редакция на гмуркането в плановика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="485"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
         <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Превключи pО₂ диаграма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="497"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
         <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Превключи pN₂ диаграма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="641"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
         <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Скалирай диаграмата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="653"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
         <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Превключи изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="665"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
         <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Преключи бутилки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="673"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
         <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>&amp;Филтрирай списъка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="688"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
         <location filename="../build/ui_mainwindow.h" line="558"/>
         <source>Toggle tissue graph</source>
         <translation>Превключи тъканна диаграма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="693"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
         <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Потребителско &amp;изследване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="698"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
         <location filename="../build/ui_mainwindow.h" line="560"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="225"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
         <source>&amp;Undo</source>
         <translation>&amp;Отмени</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="701"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
         <location filename="../build/ui_mainwindow.h" line="561"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="706"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
         <location filename="../build/ui_mainwindow.h" line="562"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="226"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
         <source>&amp;Redo</source>
         <translation>&amp;Върни</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="709"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
         <location filename="../build/ui_mainwindow.h" line="563"/>
         <source>Ctrl+Shift+Z</source>
         <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="714"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
         <location filename="../build/ui_mainwindow.h" line="564"/>
         <source>&amp;Find moved images</source>
         <translation>&amp;Намери преместени изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="719"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
         <source>Open c&amp;loud storage</source>
         <translation>&amp;Отвори облаковия склад</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="724"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
         <source>Save to clo&amp;ud storage</source>
         <translation>&amp;Запиши в облковия склад</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="729"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
         <location filename="../build/ui_mainwindow.h" line="567"/>
         <source>&amp;Manage dive sites</source>
         <translation>&amp;Редакция на места за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="734"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
         <source>Dive Site &amp;Edit</source>
         <translation>&amp;Редакция на място за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="739"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="676"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
+        <source>Add GPS location here</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
         <location filename="../build/ui_mainwindow.h" line="557"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="212"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
         <location filename="../build/ui_mainwindow.h" line="478"/>
         <source>&amp;Print</source>
         <translation>&amp;Напечатай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="223"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
         <location filename="../build/ui_mainwindow.h" line="481"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="231"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
         <location filename="../build/ui_mainwindow.h" line="482"/>
         <source>&amp;Quit</source>
         <translation>&amp;Изход</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
         <location filename="../build/ui_mainwindow.h" line="484"/>
         <source>Import from &amp;dive computer</source>
         <translation>Изтегли от леководолазен &amp;компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="253"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
         <location filename="../build/ui_mainwindow.h" line="487"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="266"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
         <location filename="../build/ui_mainwindow.h" line="490"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="292"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
         <location filename="../build/ui_mainwindow.h" line="496"/>
         <source>&amp;Renumber</source>
         <translation>&amp;Преномерирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="295"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
         <location filename="../build/ui_mainwindow.h" line="497"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="311"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
         <location filename="../build/ui_mainwindow.h" line="500"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
         <location filename="../build/ui_mainwindow.h" line="519"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="215"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
         <location filename="../build/ui_mainwindow.h" line="479"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="234"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
         <location filename="../build/ui_mainwindow.h" line="483"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="245"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
         <location filename="../build/ui_mainwindow.h" line="485"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="263"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
         <location filename="../build/ui_mainwindow.h" line="489"/>
         <source>&amp;Add dive</source>
         <translation>Добави гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="303"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
         <location filename="../build/ui_mainwindow.h" line="498"/>
         <source>Auto &amp;group</source>
         <translation>Автоматично &amp;групиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="308"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
         <location filename="../build/ui_mainwindow.h" line="499"/>
         <source>&amp;Yearly statistics</source>
         <translation>Годишни &amp;статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="316"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
         <location filename="../build/ui_mainwindow.h" line="501"/>
         <source>&amp;Dive list</source>
         <translation>&amp;Списък на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="319"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
         <location filename="../build/ui_mainwindow.h" line="502"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="327"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
         <location filename="../build/ui_mainwindow.h" line="504"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="335"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
         <location filename="../build/ui_mainwindow.h" line="506"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="343"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
         <location filename="../build/ui_mainwindow.h" line="508"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="348"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
         <location filename="../build/ui_mainwindow.h" line="509"/>
         <source>P&amp;revious DC</source>
         <translation>&amp;Предишен ГК</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="351"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
         <location filename="../build/ui_mainwindow.h" line="510"/>
         <source>Left</source>
         <translation>Ляво</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="359"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
         <location filename="../build/ui_mainwindow.h" line="512"/>
         <source>Right</source>
         <translation>Дясно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="372"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
         <location filename="../build/ui_mainwindow.h" line="514"/>
         <source>User &amp;manual</source>
         <translation>Ръководство за &amp;потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
         <location filename="../build/ui_mainwindow.h" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="383"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
         <location filename="../build/ui_mainwindow.h" line="517"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="388"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
         <location filename="../build/ui_mainwindow.h" line="518"/>
         <source>P&amp;lan dive</source>
         <translation>&amp;Планирай гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
         <location filename="../build/ui_mainwindow.h" line="520"/>
         <source>&amp;Import log files</source>
         <translation>&amp;Вмъкни регистър файлове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
         <location filename="../build/ui_mainwindow.h" line="522"/>
         <source>Import divelog files from other applications</source>
         <translation>Вмъкни регистър файлове от други приложения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="421"/>
+        <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
         <location filename="../build/ui_mainwindow.h" line="530"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="404"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="505"/>
         <source>Open file</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="408"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="513"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
         <source>Cancel</source>
         <translation>Отмяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="509"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="610"/>
         <source>Traverse image directories</source>
         <translation>Обходи папки с изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="512"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="613"/>
         <source>Scan</source>
         <translation>Сканирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="520"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="621"/>
         <source>Scanning images...(this can take a while)</source>
         <translation>Сканиране за изборажения...(това може да отнеме доста време)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="573"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
         <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="691"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
         <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="743"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="848"/>
         <source>Print runtime table</source>
         <translation>Напечатай рунтайм таблица</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Опит за редакция на гмуркане, което не е ръчно добавено.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1110"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Желаете ли да запишете промените във файла %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1113"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1246"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Желаете ли да запишете промените във файла с данни?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1118"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1251"/>
         <source>Save changes?</source>
         <translation>Запиши промените?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1485"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
         <source>Save file as</source>
         <translation>Запиши файла като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1580"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
         <source>[cloud storage for] %1</source>
         <translation>[облаков склад за] %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1680"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
         <source>Opening datafile from older version</source>
         <translation>Отваряне на файл от стара версия</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1681"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Вие отворихте файл от стара версия на Subsurface. Моля прочетете Ръковордството на потребителя за да разберете за промените в новата версия и конкретно за редакцията на места за гмуркане. Subsurface вече се опита да попълни данните автоматично, но би било добре да проверите дали местата за гмуркане са правилни.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1692"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1794"/>
         <source>Open dive log file</source>
         <translation>Отвори регистър файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1693"/>
-        <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>Регистър файлове (*.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 файлове (*.can *.CAN);;CSV файлове (*.csv *.CSV);;DiveLog.de файлове (*.dld *.DLD);;JDiveLog файлове (*.jlb *.JLB);;Liquivision файлове (*.lvd *.LVD);;MkVI файлове (*.txt *.TXT);;Suunto файлове (*.sde *.db *.SDE *.DB);;Divesoft файлове (*.dlf *.DLF);;UDDF/UDCF файлове (*.uddf *.udcf *.UDDF *.UDCF);;XML файлове (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog файлове (*.log *.LOG);;OSTCtools файлове (*.dive *.DIVE);;Всички файлове (*)</translation>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1903"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
         <source>Contacting cloud service...</source>
         <translation>Връзване към обклаковия склад...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1119"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Промените ще бъдат изгубени ако не ги запишете.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="691"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="849"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
         <source>Warning</source>
         <translation>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="398"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="443"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1458"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="771"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="338"/>
+        <source>Connect to</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
         <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="896"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
         <source>Yearly statistics</source>
         <translation>Годишни статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1486"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="843"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1738"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation>
     </message>
@@ -4847,7 +5386,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="724"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Филтърът показва %1 (от %2) гмуркания</translation>
     </message>
@@ -4855,12 +5394,12 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="261"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Препоръчваме да обновите фърмуера на вашия гмуркачески компютър: имате версия %1, а последната стабилна версия е %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -4869,27 +5408,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Моля стартирайте Bluetooth на вашия OSTC Sport и направете настройките за теглене на гмуркачески регистър преди да продължите с обновлението</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
         <source>Not now</source>
         <translation>Не сега</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="267"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
         <source>Update firmware</source>
         <translation>Обнови фърмуер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="269"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
         <source>Firmware upgrade notice</source>
         <translation>Уведомление за обновяване на фърмуера</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="287"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
         <source>Save the downloaded firmware as</source>
         <translation>Запиши изтегления фърмуер като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="288"/>
+        <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
         <source>HEX files (*.hex)</source>
         <translation>HEX файлове (*.hex)</translation>
     </message>
@@ -4897,218 +5436,338 @@ 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="323"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
         <source>Open circuit</source>
         <translation>Отворена верига</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="323"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="323"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="422"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
         <source>ft/min</source>
         <translation>фута/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="423"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
         <source>Last stop at 20ft</source>
         <translation>Последен стоп на 20фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% средна дълбочина до 20фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
         <source>20ft to surface</source>
         <translation>20фута то повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="427"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="428"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
         <source>Last stop at 6m</source>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="429"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% средна дълбочина до 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="430"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
         <source>6m to surface</source>
         <translation>6м до повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="433"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="434"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
         <source>cuft/min</source>
         <translation>кб.фута/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="442"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="443"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
         <source>ℓ/min</source>
         <translation>л/мин</translation>
     </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+        <source>bar</source>
+        <translation>бара</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+</context>
+<context>
+    <name>Preferences</name>
+    <message>
+        <location filename="../mobile-widgets/qml/Preferences.qml" line="11"/>
+        <location filename="../mobile-widgets/qml/Preferences.qml" line="37"/>
+        <source>Preferences</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Preferences.qml" line="14"/>
+        <source>Save</source>
+        <translation>Запиши</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/>
+        <source>Subsurface GPS data webservice</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/>
+        <source>Distance threshold (meters)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/>
+        <source>Time threshold (minutes)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PreferencesDefaults</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="20"/>
+        <source>Lists and tables</source>
+        <translation>Списъци и таблици</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="29"/>
+        <source>Font</source>
+        <translation>Шрифт</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="39"/>
+        <source>Font size</source>
+        <translation>Големина на шрифта</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
+        <source>Dives</source>
+        <translation>Гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
+        <source>Default dive log file</source>
+        <translation>Файл по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
+        <source>No default file</source>
+        <translation>Няма файл по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
+        <source>&amp;Local default file</source>
+        <translation>&amp;Локален файл по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
+        <source>Clo&amp;ud storage default file</source>
+        <translation>&amp;Файл по подразбиране в облаковия склад</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
+        <source>Local dive log file</source>
+        <translation>Локален файл по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
+        <source>Use default</source>
+        <translation>По подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="121"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="130"/>
+        <source>Display invalid</source>
+        <translation>Невалиден дисплей</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
+        <source>Default cylinder</source>
+        <translation>Бутилка по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
+        <source>Use default cylinder</source>
+        <translation>Използвай бутилка по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
+        <source>Animations</source>
+        <translation>Анимации</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="188"/>
+        <source>Speed</source>
+        <translation>Скорост</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
+        <source>Clear all settings</source>
+        <translation>Изтрий всички настройки</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/>
+        <source>Reset all settings to their default value</source>
+        <translation>Върни всики настройки по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/>
+        <source>Defaults</source>
+        <translation>По подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
+        <source>Open default log file</source>
+        <translation>Отвори файла по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
+        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+        <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
+    </message>
 </context>
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="88"/>
         <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="98"/>
         <location filename="../build/ui_preferences.h" line="1290"/>
         <source>Units</source>
         <translation>Единици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="108"/>
         <location filename="../build/ui_preferences.h" line="1292"/>
         <source>Graph</source>
         <translation>Диаграма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="118"/>
         <location filename="../build/ui_preferences.h" line="1294"/>
         <source>Language</source>
         <translation>Език</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="128"/>
         <location filename="../build/ui_preferences.h" line="1296"/>
         <source>Network</source>
         <translation>Мрежа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="138"/>
         <location filename="../build/ui_preferences.h" line="1298"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="148"/>
         <location filename="../build/ui_preferences.h" line="1300"/>
         <source>Georeference</source>
         <translation>Геореференция</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="195"/>
         <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="205"/>
         <location filename="../build/ui_preferences.h" line="1305"/>
         <source>Font size</source>
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
         <location filename="../build/ui_preferences.h" line="1306"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="242"/>
         <location filename="../build/ui_preferences.h" line="1308"/>
         <source>No default file</source>
         <translation>Няма файл по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="252"/>
         <location filename="../build/ui_preferences.h" line="1309"/>
         <source>&amp;Local default file</source>
         <translation>&amp;Локален файл по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="262"/>
         <location filename="../build/ui_preferences.h" line="1310"/>
         <source>Clo&amp;ud storage default file</source>
         <translation>&amp;Файл по подразбиране в облаковия склад</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="274"/>
         <location filename="../build/ui_preferences.h" line="1311"/>
         <source>Local dive log file</source>
         <translation>Локален файл по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="286"/>
         <location filename="../build/ui_preferences.h" line="1312"/>
         <source>Use default</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="296"/>
         <location filename="../build/ui_preferences.h" line="1313"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="354"/>
         <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Анимации</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="363"/>
         <location filename="../build/ui_preferences.h" line="1319"/>
         <source>Speed</source>
         <translation>Скорост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="390"/>
         <location filename="../build/ui_preferences.h" line="1320"/>
         <source>Clear all settings</source>
         <translation>Изтрий всички настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="402"/>
         <location filename="../build/ui_preferences.h" line="1321"/>
         <source>Reset all settings to their default value</source>
         <translation>Върни всики настройки по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="441"/>
         <location filename="../build/ui_preferences.h" line="1322"/>
         <source>Unit system</source>
         <translation>Система на единици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="447"/>
         <location filename="../build/ui_preferences.h" line="1323"/>
         <source>System</source>
         <translation>Състема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1408"/>
-        <source>Connect to facebook text placeholder</source>
-        <translation>Свързване с Facebook текст контейнер</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1420"/>
-        <source>Disconnect</source>
-        <translation>Изключи</translation>
-    </message>
-    <message>
         <location filename="../build/ui_preferences.h" line="1401"/>
         <source>Dive site geo lookup</source>
         <translation>Гео търсене на място за гмуркане</translation>
@@ -5129,174 +5788,143 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Същия формат за съществуващи гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1446"/>
         <location filename="../build/ui_preferences.h" line="1405"/>
         <source>Dive Site Layout</source>
         <translation>Оформление на мяста за гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1468"/>
-        <location filename="../qt-ui/preferences.ui" line="1485"/>
         <location filename="../build/ui_preferences.h" line="1406"/>
         <location filename="../build/ui_preferences.h" line="1407"/>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="464"/>
         <location filename="../build/ui_preferences.h" line="1325"/>
         <source>Imperial</source>
         <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="499"/>
         <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="506"/>
         <location filename="../build/ui_preferences.h" line="1329"/>
         <source>meter</source>
         <translation>метър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="516"/>
         <location filename="../build/ui_preferences.h" line="1330"/>
         <source>feet</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="533"/>
-        <location filename="../qt-ui/preferences.ui" line="951"/>
         <location filename="../build/ui_preferences.h" line="1332"/>
         <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="543"/>
         <location filename="../build/ui_preferences.h" line="1333"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="570"/>
         <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>кб. фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="587"/>
         <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>целзии</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="597"/>
         <location filename="../build/ui_preferences.h" line="1339"/>
         <source>fahrenheit</source>
         <translation>фаренхайт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="614"/>
         <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="930"/>
         <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: покажи сетпойнт за pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="937"/>
         <location filename="../build/ui_preferences.h" line="1364"/>
         <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation>CCR: покажи индивидуални O₂ сензор стойности за pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="944"/>
         <location filename="../build/ui_preferences.h" line="1365"/>
         <source>Default CCR set-point for dive planning</source>
         <translation>Стандартен CCR сетпойнт за плануване на гмуркане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="967"/>
         <location filename="../build/ui_preferences.h" line="1367"/>
         <source>pSCR O₂ metabolism rate</source>
         <translation>pSCR O₂ честота от метаболизъм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="974"/>
         <location filename="../build/ui_preferences.h" line="1368"/>
         <source>pSCR ratio</source>
         <translation>pSCR съотношение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="981"/>
         <location filename="../build/ui_preferences.h" line="1369"/>
         <source>ℓ/min</source>
         <translation>л/мин.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="994"/>
         <location filename="../build/ui_preferences.h" line="1371"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1042"/>
         <location filename="../build/ui_preferences.h" line="1372"/>
         <source>UI language</source>
         <translation>Език на интерфейса</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1048"/>
         <location filename="../build/ui_preferences.h" line="1373"/>
         <source>System default</source>
         <translation>По подразбиране на системата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1120"/>
         <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1159"/>
         <location filename="../build/ui_preferences.h" line="1379"/>
         <source>Proxy type</source>
         <translation>Прокси тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1142"/>
         <location filename="../build/ui_preferences.h" line="1377"/>
         <source>Host</source>
         <translation>Хост</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1132"/>
         <location filename="../build/ui_preferences.h" line="1376"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1152"/>
         <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Изисква автентификация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1169"/>
         <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1218"/>
-        <location filename="../qt-ui/preferences.ui" line="1272"/>
         <location filename="../build/ui_preferences.h" line="1381"/>
         <location filename="../build/ui_preferences.h" line="1387"/>
         <source>Password</source>
@@ -5308,362 +5936,756 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Прекъсване на връзката с Facebook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1068"/>
         <location filename="../build/ui_preferences.h" line="1374"/>
         <source>Filter</source>
         <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="526"/>
         <location filename="../build/ui_preferences.h" line="1331"/>
         <source>Pressure</source>
         <translation>Налягане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="186"/>
         <location filename="../build/ui_preferences.h" line="1303"/>
         <source>Lists and tables</source>
         <translation>Списъци и таблици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="233"/>
         <location filename="../build/ui_preferences.h" line="1307"/>
         <source>Default dive log file</source>
         <translation>Файл по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="305"/>
         <location filename="../build/ui_preferences.h" line="1314"/>
         <source>Display invalid</source>
         <translation>Невалиден дисплей</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="322"/>
         <location filename="../build/ui_preferences.h" line="1316"/>
         <source>Default cylinder</source>
         <translation>Бутилка по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="337"/>
         <location filename="../build/ui_preferences.h" line="1317"/>
         <source>Use default cylinder</source>
         <translation>Използвай бутилка по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1256"/>
         <location filename="../build/ui_preferences.h" line="1382"/>
-        <location filename="../qt-ui/preferences.cpp" line="123"/>
         <source>Subsurface cloud storage</source>
         <translation>Subsurface облков склад</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1265"/>
         <location filename="../build/ui_preferences.h" line="1386"/>
         <source>Email address</source>
         <translation>Емейл адрес</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1279"/>
         <location filename="../build/ui_preferences.h" line="1388"/>
         <source>Verification PIN</source>
         <translation>PIN проверка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1286"/>
-        <source>New password</source>
-        <translation>Нова парола</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="1321"/>
         <location filename="../build/ui_preferences.h" line="1395"/>
         <source>Sync to cloud in the background?</source>
         <translation>Синхронизирай с облака на фон?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1328"/>
         <location filename="../build/ui_preferences.h" line="1396"/>
         <source>Save Password locally?</source>
         <translation>Запиши паролата локално?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1338"/>
         <location filename="../build/ui_preferences.h" line="1397"/>
         <source>Subsurface web service</source>
         <translation>Subsurface уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1350"/>
         <location filename="../build/ui_preferences.h" line="1398"/>
         <source>Default user ID</source>
         <translation>Потребителски ID по подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1360"/>
         <location filename="../build/ui_preferences.h" line="1399"/>
         <source>Save user ID locally?</source>
         <translation>Запази потребителски ID локално</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="553"/>
         <location filename="../build/ui_preferences.h" line="1334"/>
         <source>Volume</source>
         <translation>Обем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="580"/>
         <location filename="../build/ui_preferences.h" line="1337"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="607"/>
         <location filename="../build/ui_preferences.h" line="1340"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="624"/>
         <location filename="../build/ui_preferences.h" line="1342"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="639"/>
         <location filename="../build/ui_preferences.h" line="1343"/>
         <source>Time units</source>
         <translation>Единици за време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="652"/>
         <location filename="../build/ui_preferences.h" line="1345"/>
         <source>Minutes</source>
         <translation>Минути</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
         <location filename="../build/ui_preferences.h" line="1346"/>
         <source>Seconds</source>
         <translation>Секунди</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="742"/>
         <location filename="../build/ui_preferences.h" line="1351"/>
         <source>Show</source>
         <translation>Покажи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="923"/>
         <location filename="../build/ui_preferences.h" line="1362"/>
         <source>GFLow at max depth</source>
         <translation>GFLow на макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="883"/>
         <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="454"/>
         <location filename="../build/ui_preferences.h" line="1324"/>
         <source>&amp;Metric</source>
         <translation>&amp;Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="474"/>
         <location filename="../build/ui_preferences.h" line="1326"/>
         <source>Personali&amp;ze</source>
         <translation>&amp;Персонализация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="487"/>
         <location filename="../build/ui_preferences.h" line="1327"/>
         <source>Individual settings</source>
         <translation>Индивидуални настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="560"/>
         <location filename="../build/ui_preferences.h" line="1335"/>
         <source>&amp;liter</source>
         <translation>&amp;литра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="645"/>
         <location filename="../build/ui_preferences.h" line="1344"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Знаменател за скорост на изкачване/спускане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="677"/>
         <location filename="../build/ui_preferences.h" line="1347"/>
         <source>GPS coordinates</source>
         <translation>GPS координати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="683"/>
         <location filename="../build/ui_preferences.h" line="1348"/>
         <source>Location Display</source>
         <translation>Дисплей на местонахождение:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="690"/>
         <location filename="../build/ui_preferences.h" line="1349"/>
         <source>traditional (dms)</source>
         <translation>традиционен (dms)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="700"/>
         <location filename="../build/ui_preferences.h" line="1350"/>
         <source>decimal</source>
         <translation>десетичен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="753"/>
         <location filename="../build/ui_preferences.h" line="1352"/>
         <source>Threshold when showing pO₂</source>
         <translation>Праг при показване на pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
         <location filename="../build/ui_preferences.h" line="1353"/>
         <source>Threshold when showing pN₂</source>
         <translation>Праг при показване на pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="801"/>
         <location filename="../build/ui_preferences.h" line="1354"/>
         <source>Threshold when showing pHe</source>
         <translation>Праг при показване на pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="825"/>
         <location filename="../build/ui_preferences.h" line="1355"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Макс. pO₂ при показване на MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="849"/>
         <location filename="../build/ui_preferences.h" line="1356"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Покажи таван на гмуркачески компютър в червено</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="860"/>
         <location filename="../build/ui_preferences.h" line="1357"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Покажи неизползвани бутилки в екипировка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="871"/>
         <location filename="../build/ui_preferences.h" line="1358"/>
         <source>Show average depth</source>
         <translation>Покажи средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="889"/>
         <location filename="../build/ui_preferences.h" line="1360"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="906"/>
         <location filename="../build/ui_preferences.h" line="1361"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesGeoreference</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/>
+        <source>Dive site geo lookup</source>
+        <translation>Гео търсене на място за гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation>Включи геокодиране за редакцията на места за гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/>
+        <source>Parse site without GPS data</source>
+        <translation>Разбор на място без GPS данни</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/>
+        <source>Same format for existing dives</source>
+        <translation>Същия формат за съществуващи гмуркания</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/>
+        <source>Dive Site Layout</source>
+        <translation>Оформление на мяста за гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/>
+        <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/>
+        <source>/</source>
+        <translation>/</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
+        <source>Georeference</source>
+        <translation>Геореференция</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesGraph</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
+        <source>Show</source>
+        <translation>Покажи</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
+        <source>Threshold when showing pO₂</source>
+        <translation>Праг при показване на pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
+        <source>Threshold when showing pN₂</source>
+        <translation>Праг при показване на pN₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
+        <source>Threshold when showing pHe</source>
+        <translation>Праг при показване на pHe</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
+        <source>Max pO₂ when showing MOD</source>
+        <translation>Макс. pO₂ при показване на MOD</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+        <source>Draw dive computer reported ceiling red</source>
+        <translation>Покажи таван на гмуркачески компютър в червено</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
+        <source>Show unused cylinders in Equipment tab</source>
+        <translation>Покажи неизползвани бутилки в екипировка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
+        <source>Show mean depth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+        <source>Misc</source>
+        <translation>Общи</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
+        <source>bar</source>
+        <translation>бара</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation>Стандартен CCR сетпойнт за плануване на гмуркане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation>pSCR O₂ честота от метаболизъм</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <source>GFLow</source>
+        <translation>GFLow</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <source>GFHigh</source>
+        <translation>GFHigh</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
+        <source>ℓ/min</source>
+        <translation>л/мин.</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
+        <source>pSCR ratio</source>
+        <translation>pSCR съотношение</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+        <source>1:</source>
+        <translation>1:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
+        <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
+        <translation>CCR: покажи индивидуални O₂ сензор стойности за pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
+        <translation>CCR: покажи сетпойнт за pO₂</translation>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="45"/>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
+        <source>GFLow at max depth</source>
+        <translation>GFLow на макс. дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+        <source>Graph</source>
+        <translation>Диаграма</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesLanguage</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="26"/>
+        <source>UI language</source>
+        <translation>Език на интерфейса</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
+        <source>Use system default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
+        <source>Filter</source>
+        <translation>Филтър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="74"/>
+        <source>Date format</source>
+        <translation>Формат на датата</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
+        <source>Use UI language default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
+        <source>This is used in places where there is less space to show the full date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
+        <source>Short format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
+        <source>Time format</source>
+        <translation>Времеви формат</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/>
+        <source>Language</source>
+        <translation>Език</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+        <source>Restart required</source>
+        <translation>Нужен рестарт</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesNetwork</name>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="20"/>
+        <source>Proxy</source>
+        <translation>Прокси</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/>
+        <source>Port</source>
+        <translation>Порт</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="39"/>
+        <source>Host</source>
+        <translation>Хост</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="46"/>
+        <source>Proxy type</source>
+        <translation>Прокси тип</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="56"/>
+        <source>Username</source>
+        <translation>Потребителско име</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="108"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="172"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="134"/>
+        <source>Requires authentication</source>
+        <translation>Изисква автентификация</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+        <source>Subsurface cloud storage</source>
+        <translation>Subsurface облков склад</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="165"/>
+        <source>Email address</source>
+        <translation>Емейл адрес</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="179"/>
+        <source>Verification PIN</source>
+        <translation>PIN проверка</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="186"/>
+        <source>New password</source>
+        <translation>Нова парола</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/>
+        <source>Sync to cloud in the background?</source>
+        <translation>Синхронизирай с облака на фон?</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="228"/>
+        <source>Save Password locally?</source>
+        <translation>Запиши паролата локално?</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="238"/>
+        <source>Subsurface web service</source>
+        <translation>Subsurface уеб услуга</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="250"/>
+        <source>Default user ID</source>
+        <translation>Потребителски ID по подразбиране</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="260"/>
+        <source>Save user ID locally?</source>
+        <translation>Запази потребителски ID локално</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+        <source>Network</source>
+        <translation>Мрежа</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
         <source>No proxy</source>
         <translation>Без прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="46"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>System proxy</source>
         <translation>Системно прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="47"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>HTTP proxy</source>
         <translation>HTTP прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="48"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
         <source>SOCKS proxy</source>
         <translation>SOCKS прокси</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="89"/>
-        <source>To disconnect Subsurface from your Facebook account, use the button below</source>
-        <translation>За да прекъснете връзката на Subsurface с вашия Facebook акаунт, моля натиснете бутона по-долу.</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.cpp" line="101"/>
-        <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
-        <translation>За да се свържете с Facebook, моля въведете потребител и парола. Това позволява на Subsurface да публикува гмуркания на вашия таймлайн.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+        <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
+        <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, &apos;.&apos;, &apos;-&apos;, &apos;_&apos; и &apos;+&apos;.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="120"/>
+        <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
         <source>Subsurface cloud storage (credentials verified)</source>
         <translation>Subsurface облков склад (паролата проверена)</translation>
     </message>
+</context>
+<context>
+    <name>PreferencesUnits</name>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="332"/>
-        <source>Restart required</source>
-        <translation>Нужен рестарт</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="333"/>
-        <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation>За да смените успешно език е необходим рестарт на Subsurface.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="20"/>
+        <source>Unit system</source>
+        <translation>Система на единици</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="363"/>
-        <location filename="../qt-ui/preferences.cpp" line="385"/>
-        <location filename="../qt-ui/preferences.cpp" line="398"/>
-        <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
-        <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, &apos;.&apos;, &apos;-&apos;, &apos;_&apos; и &apos;+&apos;.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="26"/>
+        <source>System</source>
+        <translation>Състема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="492"/>
-        <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
-        <translation>Ако изберете OK, всички настройки на Subsurface ще бъдат върнати по подразбиране. Това ще бъде изпълнено веднага.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="33"/>
+        <source>&amp;Metric</source>
+        <translation>&amp;Метрична</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="478"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="40"/>
+        <source>Imperial</source>
+        <translation>Империална</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="478"/>
-        <source>Open default log file</source>
-        <translation>Отвори файла по подразбиране</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="47"/>
+        <source>Personali&amp;ze</source>
+        <translation>&amp;Персонализация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="491"/>
-        <source>Warning</source>
-        <translation>Предупреждение</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="57"/>
+        <source>Individual settings</source>
+        <translation>Индивидуални настройки</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="69"/>
+        <source>Depth</source>
+        <translation>Дълбочина</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="76"/>
+        <source>meter</source>
+        <translation>метър</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="86"/>
+        <source>feet</source>
+        <translation>фута</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="96"/>
+        <source>Pressure</source>
+        <translation>Налягане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="103"/>
+        <source>bar</source>
+        <translation>бара</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="113"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="123"/>
+        <source>Volume</source>
+        <translation>Обем</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="130"/>
+        <source>&amp;liter</source>
+        <translation>&amp;литра</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/>
+        <source>cu ft</source>
+        <translation>кб. фут</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/>
+        <source>Temperature</source>
+        <translation>Температура:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="157"/>
+        <source>celsius</source>
+        <translation>целзии</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="167"/>
+        <source>fahrenheit</source>
+        <translation>фаренхайт</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="177"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="184"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="194"/>
+        <source>lbs</source>
+        <translation>паунда</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="207"/>
+        <source>Time units</source>
+        <translation>Единици за време</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="213"/>
+        <source>Ascent/descent speed denominator</source>
+        <translation>Знаменател за скорост на изкачване/спускане</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="220"/>
+        <source>Minutes</source>
+        <translation>Минути</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="227"/>
+        <source>Seconds</source>
+        <translation>Секунди</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/>
+        <source>GPS coordinates</source>
+        <translation>GPS координати</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/>
+        <source>Location Display</source>
+        <translation>Дисплей на местонахождение:</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/>
+        <source>traditional (dms)</source>
+        <translation>традиционен (dms)</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/>
+        <source>decimal</source>
+        <translation>десетичен</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+        <source>Units</source>
+        <translation>Единици</translation>
     </message>
 </context>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="119"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
         <source>&amp;Preview</source>
         <translation>&amp;Преглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="116"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
         <source>P&amp;rint</source>
         <translation>Пе&amp;чатане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="131"/>
+        <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
         <source>Print</source>
         <translation>Напечатай</translation>
     </message>
@@ -5686,406 +6708,456 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>Две гмуркания на страница</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="41"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="41"/>
         <location filename="../build/ui_printoptions.h" line="149"/>
         <source>&amp;Dive list print</source>
         <translation>&amp;Печат на списък на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="57"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="57"/>
         <location filename="../build/ui_printoptions.h" line="151"/>
         <source>&amp;Statistics print</source>
         <translation>&amp;Статистически печат</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="67"/>
+        <location filename="../desktop-widgets/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="79"/>
+        <location filename="../desktop-widgets/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="92"/>
+        <location filename="../desktop-widgets/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="102"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="102"/>
         <location filename="../build/ui_printoptions.h" line="155"/>
         <source>Template</source>
         <translation>Шаблон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="127"/>
+        <location filename="../desktop-widgets/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"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="134"/>
         <source>Delete</source>
         <translation>Изтрий</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="141"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="141"/>
         <source>Export</source>
         <translation>Експорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="148"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="29"/>
+        <location filename="../desktop-widgets/printoptions.ui" line="29"/>
         <location filename="../build/ui_printoptions.h" line="148"/>
         <source>Print type</source>
         <translation>Тип на печата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.cpp" line="150"/>
+        <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
         <source>Import template file</source>
         <translation>Импорт на шаблон файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.cpp" line="151"/>
-        <location filename="../qt-ui/printoptions.cpp" line="164"/>
+        <location filename="../desktop-widgets/printoptions.cpp" line="129"/>
+        <location filename="../desktop-widgets/printoptions.cpp" line="142"/>
         <source>HTML files (*.html)</source>
         <translation>HTML файлове (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.cpp" line="163"/>
+        <location filename="../desktop-widgets/printoptions.cpp" line="141"/>
         <source>Export template files as</source>
         <translation>Експорт на шаблонен файл като</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.cpp" line="174"/>
+        <location filename="../desktop-widgets/printoptions.cpp" line="152"/>
         <source>This action cannot be undone!</source>
         <translation>Това действие на може да бъде върнато!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.cpp" line="175"/>
+        <location filename="../desktop-widgets/printoptions.cpp" line="153"/>
         <source>Delete template: %1?</source>
         <translation>Изтрий шаблон: %1?</translation>
     </message>
 </context>
 <context>
-    <name>ProfilePrintModel</name>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="44"/>
-        <source>unknown</source>
-        <translation>неизвестно</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="49"/>
-        <source>Dive #%1 - %2</source>
-        <translation>Гмуркане №%1 - %2</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="52"/>
-        <source>Max depth: %1 %2</source>
-        <translation>Макс. дълбочина: %1 %2</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="59"/>
-        <source>Duration: %1 min</source>
-        <translation>Времетраене: %1 мин</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="64"/>
-        <source>Gas used:</source>
-        <translation>Използван газ:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="66"/>
-        <source>Tags:</source>
-        <translation>Тагове:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="68"/>
-        <source>SAC:</source>
-        <translation>SAC:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="70"/>
-        <source>Weights:</source>
-        <translation>Тежести:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="75"/>
-        <source>Notes:</source>
-        <translation>Бележки:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="82"/>
-        <source>Divemaster:</source>
-        <translation>Водач:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="84"/>
-        <source>Buddy:</source>
-        <translation>Партньор:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="86"/>
-        <source>Suit:</source>
-        <translation>Водолазен костюм:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="88"/>
-        <source>Viz:</source>
-        <translation>Видимост:</translation>
-    </message>
-    <message>
-        <location filename="../qt-models/profileprintmodel.cpp" line="90"/>
-        <source>Rating:</source>
-        <translation>Оценка:</translation>
-    </message>
-</context>
-<context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="666"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="729"/>
         <source> (#%1 of %2)</source>
         <translation> (№%1 от %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="668"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="732"/>
         <source>Unknown dive computer</source>
         <translation>Непознат гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="685"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1232"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1344"/>
         <source>Make first divecomputer</source>
         <translation>Направи първи гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1234"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
         <source>Delete this divecomputer</source>
         <translation>Изтрий този гмуркачески компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1248"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
         <source>Add gas change</source>
         <translation>Добави промяна на газа</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1251"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
         <source> (Tank %1)</source>
         <translation>(Танк %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1259"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
         <source>Add set-point change</source>
         <translation>Добави set-point промяна</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
         <source>Add bookmark</source>
         <translation>Добави бележка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1265"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
         <source>Edit the profile</source>
         <translation>Редакция на профил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1269"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
         <source>Remove event</source>
         <translation>Премахни събитие</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1274"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
         <source>Hide similar events</source>
         <translation>Премахни малки събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1281"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
         <source>Edit name</source>
         <translation>Редактирай име</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1310"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1317"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1332"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
         <source>Unhide all events</source>
         <translation>Покажи всички събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
         <source>Hide events</source>
         <translation>Скрий събития</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1366"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
         <source>Hide all %1 events?</source>
         <translation>Скрий всички %1 събития?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1401"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
         <source>Remove the selected event?</source>
         <translation>Премахни избраните събития?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1402"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1517"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
         <source>Edit name of bookmark</source>
         <translation>Редактирай име в показалец</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1518"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
         <source>Custom name:</source>
         <translation>Потребителско име:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1523"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
         <source>Name is too long!</source>
         <translation> Името е прекалено дълго!</translation>
     </message>
 </context>
 <context>
+    <name>QMLManager</name>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+        <source>Starting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+        <source>working in no-cloud mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+        <source>no cloud credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+        <source>Please enter valid cloud credentials.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+        <source>Attempting to open cloud storage with new credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+        <source>Testing cloud credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+        <source>Cloud credentials are invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+        <source>Cannot open cloud storage: Error creating https connection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+        <source>Cannot open cloud storage: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+        <source>Cannot connect to cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+        <source>Cloud storage error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+        <source>Failed to connect to cloud server, reverting to no cloud status</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+        <source>Cloud storage open successfully. No dives in dive list.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <source>h</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+        <source>min</source>
+        <translation>мин</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+        <source>sec</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+        <source>Unknown GPS location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
-        <location filename="../qthelper.cpp" line="1310"/>
+        <location filename="../core/qthelper.cpp" line="866"/>
+        <location filename="../core/qthelper.cpp" line="1214"/>
         <source>AIR</source>
         <translation>Въздух</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1310"/>
+        <location filename="../core/qthelper.cpp" line="1214"/>
         <source>OXYGEN</source>
         <translation>КИСЛОРОД</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="59"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
         <source>Remove this point</source>
         <translation>Изтрий тази точка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
         <source>Average</source>
         <translation>Средно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
         <source>Minimum</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="36"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
         <source>Maximum</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="327"/>
+        <location filename="../desktop-widgets/globe.cpp" line="327"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="194"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
+        <source>unknown</source>
+        <translation>неизвестно</translation>
+    </message>
+    <message>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
         <source>h:</source>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="194"/>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1072"/>
-        <location filename="../qthelper.cpp" line="1074"/>
-        <source>(%1 dives)</source>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
+        <source>Multiple</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qthelper.cpp" line="1077"/>
-        <source>(1 dive)</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <location filename="../core/qthelper.cpp" line="957"/>
+        <source>(%n dive(s))</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1324"/>
+        <location filename="../core/qthelper.cpp" line="816"/>
+        <location filename="../core/qthelper.cpp" line="1228"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1325"/>
+        <location filename="../core/qthelper.cpp" line="818"/>
+        <location filename="../core/qthelper.cpp" line="1229"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1348"/>
+        <location filename="../core/qthelper.cpp" line="763"/>
+        <location filename="../core/qthelper.cpp" line="1252"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1349"/>
+        <location filename="../core/qthelper.cpp" line="761"/>
+        <location filename="../core/qthelper.cpp" line="1253"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1371"/>
+        <location filename="../core/qthelper.cpp" line="789"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="791"/>
+        <source>F</source>
+        <translation>F</translation>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="845"/>
+        <location filename="../core/qthelper.cpp" line="1275"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1372"/>
+        <location filename="../core/qthelper.cpp" line="843"/>
+        <location filename="../core/qthelper.cpp" line="1276"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1394"/>
+        <location filename="../core/qthelper.cpp" line="868"/>
+        <source>EAN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/qthelper.cpp" line="1298"/>
         <source>l</source>
         <translation>л</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1395"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="604"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
         <source>Invalid response from server</source>
         <translation>Грешен отговор от сървъра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="612"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Очакван XML таг &apos;DiveDateReader&apos;, вместо това получен &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="658"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="679"/>
         <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="665"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="686"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Грешен XML отговор. Ред %1: %2</translation>
     </message>
+    <message>
+        <location filename="../core/gpslocation.h" line="13"/>
+        <source>Waiting to aquire GPS location</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1634"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1659"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
@@ -6093,20 +7165,20 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>RenumberDialog</name>
     <message>
-        <location filename="../qt-ui/renumber.ui" line="17"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/renumber.ui" line="43"/>
         <location filename="../build/ui_renumber.h" line="80"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="139"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>New starting number</source>
         <translation>Нов стартов номер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="137"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="140"/>
         <source>New number</source>
         <translation>Нов номер</translation>
     </message>
@@ -6114,7 +7186,7 @@ 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="1758"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
         <source>Reset settings failed!</source>
         <translation>Изчистването на настройките се провали!</translation>
     </message>
@@ -6122,7 +7194,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SearchBar</name>
     <message>
-        <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <location filename="../desktop-widgets/searchbar.ui" line="14"/>
         <location filename="../build/ui_searchbar.h" line="120"/>
         <source>Form</source>
         <translation>Форма</translation>
@@ -6131,19 +7203,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>SetpointDialog</name>
     <message>
-        <location filename="../qt-ui/setpoint.ui" line="17"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/setpoint.ui" line="43"/>
         <location filename="../build/ui_setpoint.h" line="83"/>
         <source>New set-point (0 for OC)</source>
         <translation>Нова set-point (0 за OC)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/setpoint.ui" line="61"/>
+        <location filename="../desktop-widgets/setpoint.ui" line="61"/>
         <location filename="../build/ui_setpoint.h" line="84"/>
         <source>bar</source>
         <translation>бара</translation>
@@ -6152,37 +7224,37 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 <context>
     <name>ShiftImageTimesDialog</name>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
         <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
         <translation>Измести време на изображение(изображенията) с</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="95"/>
         <location filename="../build/ui_shiftimagetimes.h" line="186"/>
         <source>h:mm</source>
         <translation>ч:мм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
         <location filename="../build/ui_shiftimagetimes.h" line="184"/>
         <source>Shift selected image times</source>
         <translation>Измести избраните времена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
         <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
         <translation>По-рано</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="112"/>
         <location filename="../build/ui_shiftimagetimes.h" line="188"/>
         <source>Later</source>
         <translation>По-късно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="128"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="128"/>
         <location filename="../build/ui_shiftimagetimes.h" line="189"/>
         <source>Warning!
 Not all images have timestamps in the range between
@@ -6191,41 +7263,41 @@ Not all images have timestamps in the range between
 Не всички изображения имат времеви печати в диапазона 30 минути преди началото и 30 минути след края на избраното гмуркане.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="137"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/>
         <source>Load images even if the time does not match the dive time</source>
         <translation>Зареди изображения дори ако времената им не съвпадат с времето на гмуркането</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="180"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="180"/>
         <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>За да изчислите отклонението между времето на гмуркане от гмуркаческия компютър и камерата, използвайте камерата за да направите снимка на вашия гмуркачески компютър показващ настоящото време. Изтеглете това изображение на вашия компютър и натиснете този бутон.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="190"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="190"/>
         <location filename="../build/ui_shiftimagetimes.h" line="195"/>
         <source>Determine camera time offset</source>
         <translation>Определи отклонение на времето на камерата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="193"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="193"/>
         <location filename="../build/ui_shiftimagetimes.h" line="197"/>
         <source>Select image of divecomputer showing time</source>
         <translation>Избери снимка на гмуркачески компютър показващ времето</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="215"/>
+        <location filename="../desktop-widgets/shiftimagetimes.ui" line="215"/>
         <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="289"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
         <source>Open image file</source>
         <translation>Отвори изображения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="291"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -6233,51 +7305,51 @@ Not all images have timestamps in the range between
 <context>
     <name>ShiftTimesDialog</name>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="23"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="23"/>
         <location filename="../build/ui_shifttimes.h" line="136"/>
         <source>Shift selected dive times</source>
         <translation>Измести избраните времена</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="49"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="49"/>
         <location filename="../build/ui_shifttimes.h" line="137"/>
         <source>Shift times of selected dives by</source>
         <translation>Измести времената в избраните гмуркания с</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="72"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="72"/>
         <location filename="../build/ui_shifttimes.h" line="138"/>
         <source>Shifted time:</source>
         <translation>Изместено време:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="79"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="79"/>
         <location filename="../build/ui_shifttimes.h" line="139"/>
         <source>Current time:</source>
         <translation>Текущо време:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="86"/>
-        <location filename="../qt-ui/shifttimes.ui" line="93"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="86"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/shifttimes.ui" line="126"/>
         <location filename="../build/ui_shifttimes.h" line="142"/>
         <source>h:mm</source>
         <translation>ч:мм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="136"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="136"/>
         <location filename="../build/ui_shifttimes.h" line="143"/>
         <source>Earlier</source>
         <translation>По-рано</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shifttimes.ui" line="143"/>
+        <location filename="../desktop-widgets/shifttimes.ui" line="143"/>
         <location filename="../build/ui_shifttimes.h" line="144"/>
         <source>Later</source>
         <translation>По-късно</translation>
@@ -6317,56 +7389,120 @@ Not all images have timestamps in the range between
     </message>
 </context>
 <context>
+    <name>Smrtk2ssrfcWindow</name>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
+        <source>SmartTrak files importer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
+        <source>Choose</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
+        <source>Import</source>
+        <translation>Импорт</translation>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
+        <source>Import messages (Errors, warnings, etc)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/>
+        <source>Open SmartTrak files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
+        <source>SmartTrak files (*.slg *.SLG);;All files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
+        <source>Open Subsurface files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
+        <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="298"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
         <source>Dive date: %1 
 </source>
         <translation>Дата на гмуркане: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="301"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
         <source>Duration: %1 
 </source>
         <translation>Времетраене: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="302"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>ч:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="303"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="306"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
         <source>Dive location: %1 
 </source>
         <translation>Местонахождение: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="309"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
         <source>Buddy: %1 
 </source>
         <translation>Партньор: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="312"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
         <source>Divemaster: %1 
 </source>
         <translation>Водач: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="315"/>
+        <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
         <source>
 %1</source>
         <translation>
@@ -6376,154 +7512,164 @@ Not all images have timestamps in the range between
 <context>
     <name>SocialnetworksDialog</name>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/>
+        <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="14"/>
         <location filename="../build/ui_socialnetworksdialog.h" line="140"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/>
+        <location filename="../desktop-widgets/plugins/facebook/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>Текста от дясно ще бъде използван като описание към вашето изображение на гмуркачески профил. Името на албума е нужно (изображението ще бъде добавено в този албум).</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/>
+        <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="70"/>
         <location filename="../build/ui_socialnetworksdialog.h" line="142"/>
         <source>Album</source>
         <translation>Албум</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/>
+        <location filename="../desktop-widgets/plugins/facebook/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>Гмуркаческия профил ще бъде качен в този албум (нужно)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/>
+        <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="84"/>
         <location filename="../build/ui_socialnetworksdialog.h" line="146"/>
         <source>Include</source>
         <translation>Включи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/>
+        <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="91"/>
         <location filename="../build/ui_socialnetworksdialog.h" line="147"/>
         <source>Date and time</source>
         <translation>Дата и време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/>
+        <location filename="../desktop-widgets/plugins/facebook/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="../desktop-widgets/plugins/facebook/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="../desktop-widgets/plugins/facebook/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="../desktop-widgets/plugins/facebook/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="../desktop-widgets/plugins/facebook/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="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="139"/>
         <location filename="../build/ui_socialnetworksdialog.h" line="153"/>
         <source>Facebook post preview</source>
         <translation>Faceboоk преглед</translation>
     </message>
 </context>
 <context>
+    <name>StartPage</name>
+    <message>
+        <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
+        <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+
+To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SubsurfaceAbout</name>
     <message>
-        <location filename="../qt-ui/about.ui" line="23"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/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="../desktop-widgets/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="../desktop-widgets/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="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>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;мулти-платформен, гмуркачески регистър софтуер&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Линус Торвалдс, Дърк Хондел, Томаз Канабрава, и други, 2011-2015&lt;/span&gt;</translation>
+        <location filename="../desktop-widgets/about.cpp" line="19"/>
+        <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2016&lt;/span&gt;</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="398"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
         <source>Webservice</source>
         <translation>Уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="484"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="505"/>
         <source>Connecting...</source>
         <translation>Свръзване...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="503"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="524"/>
         <source>Download finished</source>
         <translation>Изтеглянето приключи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="517"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="538"/>
         <source>Download error: %1</source>
         <translation>Грешка при изтеглянето: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="527"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="548"/>
         <source>Connection error: </source>
         <translation>Грешка при връзка: </translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="536"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
         <source>Download successful</source>
         <translation>Успешно изтегляне</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="530"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
         <source>Invalid user identifier!</source>
         <translation>Грешен потребителски ключ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="377"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
         <source>Enter User ID and click Download</source>
         <translation>Въведете потребителски ID и натиснете &quot;Изтегли&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="533"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
         <source>Cannot parse response!</source>
         <translation>Не може да бъде напревен разряд!</translation>
     </message>
@@ -6531,7 +7677,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="665"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
         <source>Suits: </source>
         <translation>Костюми:</translation>
     </message>
@@ -6539,7 +7685,7 @@ Not all images have timestamps in the range between
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="119"/>
+        <location filename="../qt-models/filtermodels.cpp" line="123"/>
         <source>No suit set</source>
         <translation>Няма избран костюм</translation>
     </message>
@@ -6547,8 +7693,8 @@ Not all images have timestamps in the range between
 <context>
     <name>TableView</name>
     <message>
-        <location filename="../qt-ui/tableview.ui" line="14"/>
-        <location filename="../qt-ui/tableview.ui" line="17"/>
+        <location filename="../desktop-widgets/tableview.ui" line="14"/>
+        <location filename="../desktop-widgets/tableview.ui" line="17"/>
         <location filename="../build/ui_tableview.h" line="49"/>
         <location filename="../build/ui_tableview.h" line="50"/>
         <source>GroupBox</source>
@@ -6558,7 +7704,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="586"/>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
         <source>Tags: </source>
         <translation>Тагове:</translation>
     </message>
@@ -6566,7 +7712,7 @@ Not all images have timestamps in the range between
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-models/filtermodels.cpp" line="144"/>
+        <location filename="../qt-models/filtermodels.cpp" line="148"/>
         <source>Empty tags</source>
         <translation>Празни тагове</translation>
     </message>
@@ -6574,17 +7720,17 @@ Not all images have timestamps in the range between
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="90"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="90"/>
         <source>ml</source>
         <translation>мл.</translation>
     </message>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="90"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -6592,167 +7738,167 @@ Not all images have timestamps in the range between
 <context>
     <name>TemplateEdit</name>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="37"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
         <translation>Преглед</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="94"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="94"/>
         <source>Style</source>
         <translation>Стил</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="104"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="104"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="112"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="112"/>
         <source>Arial</source>
         <translation>Arial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="117"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="117"/>
         <source>Impact</source>
         <translation>Impact</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="122"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="122"/>
         <source>Georgia</source>
         <translation>Georgia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="127"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="127"/>
         <source>Courier</source>
         <translation>Courier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="132"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="132"/>
         <source>Verdana</source>
         <translation>Verdana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="144"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="144"/>
         <source>Font size</source>
         <translation>Големина на шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="14"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="14"/>
         <source>Edit template</source>
         <translation>Редакция на шаблон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="165"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
         <translation>Цветова палитра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="173"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="173"/>
         <source>Default</source>
         <translation>По подразбиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="178"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="178"/>
         <source>Almond</source>
         <translation>Almond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="183"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="183"/>
         <source>Shades of blue</source>
         <translation>Shades of blue</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="188"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="188"/>
         <source>Custom</source>
         <translation>Custom</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="200"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="200"/>
         <source>Line spacing</source>
         <translation>Разтояние между редовете</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="241"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="241"/>
         <source>Template</source>
         <translation>Шаблон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="264"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="264"/>
         <source>Colors</source>
         <translation>Цветове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="280"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="280"/>
         <source>Background</source>
         <translation>Фон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="293"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="293"/>
         <source>color1</source>
         <translation>color1</translation>
     </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"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="303"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="343"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="383"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="423"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="463"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="503"/>
         <source>Edit</source>
         <translation>Редактирай</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="320"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="320"/>
         <source>Table cells 1</source>
         <translation>Кутии на таблицата 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="333"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="333"/>
         <source>color2</source>
         <translation>color2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="360"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="360"/>
         <source>Table cells 2</source>
         <translation>Кутии на таблицата 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="373"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="373"/>
         <source>color3</source>
         <translation>color3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="400"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="400"/>
         <source>Text 1</source>
         <translation>Текст 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="413"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="413"/>
         <source>color4</source>
         <translation>color4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="440"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="440"/>
         <source>Text 2</source>
         <translation>Текст 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="453"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="453"/>
         <source>color5</source>
         <translation>color5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="480"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="480"/>
         <source>Borders</source>
         <translation>Граници</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="493"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="493"/>
         <source>color6</source>
         <translation>color6</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.cpp" line="133"/>
+        <location filename="../desktop-widgets/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
         <translation>Искате ли да запишете промените?</translation>
     </message>
@@ -6821,19 +7967,92 @@ Not all images have timestamps in the range between
     </message>
 </context>
 <context>
-    <name>ToolTipItem</name>
+    <name>TextHyperlinkEventFilter</name>
     <message>
-        <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
-        <source>Information</source>
-        <translation>Информация</translation>
+        <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+        <source>%1click to visit %2</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ThemeTest</name>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
+        <source>Theme Information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
+        <source>Screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
+        <source>Geometry (pixels):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
+        <source>Geometry (gridUnits):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
+        <source>Units.gridUnit:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
+        <source>Units.devicePixelRatio:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
+        <source>Font Metrics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
+        <source>FontMetrics pointSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
+        <source>FontMetrics pixelSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
+        <source>FontMetrics devicePixelRatio:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
+        <source>Text item pixelSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
+        <source>Text item pointSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
+        <source>Pixel density:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
+        <source>Height of default font:</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>TopBar</name>
+    <name>ToolTipItem</name>
     <message>
-        <location filename="../qt-mobile/TopBar.qml" line="59"/>
-        <source>Subsurface mobile</source>
-        <translation>Subsurface мобайл</translation>
+        <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
+        <source>Information</source>
+        <translation>Информация</translation>
     </message>
 </context>
 <context>
@@ -6942,13 +8161,13 @@ Not all images have timestamps in the range between
 <context>
     <name>URLDialog</name>
     <message>
-        <location filename="../qt-ui/urldialog.ui" line="14"/>
+        <location filename="../desktop-widgets/urldialog.ui" line="14"/>
         <location filename="../build/ui_urldialog.h" line="57"/>
         <source>Dialog</source>
         <translation>Диалог</translation>
     </message>
     <message>
-        <location filename="../qt-ui/urldialog.ui" line="52"/>
+        <location filename="../desktop-widgets/urldialog.ui" line="52"/>
         <location filename="../build/ui_urldialog.h" line="58"/>
         <source>Enter URL for images</source>
         <translation>Въведете URL за изображения</translation>
@@ -6957,72 +8176,72 @@ Not all images have timestamps in the range between
 <context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="83"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
         <source>Check for updates.</source>
         <translation>Провери за обновления</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Subsurface не успя да провери за обновления.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="89"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
         <source>The following error occurred:</source>
         <translation>Грешка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="90"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
         <source>Please check your internet connection.</source>
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="100"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Вие използватe последната версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Има нова версия на Subsruface.&lt;br/&gt;Щракнете на:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; за да я изтеглите.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="109"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Има нова версия на Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="110"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Последната версия е %1, моля проверете %2 нашата страница %3 за информация как да обновите.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="120"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
         <source>Newest release version is </source>
         <translation>Най-новата весия е</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
         <source>The server returned the following information:</source>
         <translation>Сървъра върна следната информация:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="139"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface проверява всеки две седмици ако нова версия е налична. Ако не искате тази проверка да продължи моля изберете Decline/Oткажи.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="140"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
         <source>Decline</source>
         <translation>Откажи</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="141"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
         <source>Accept</source>
         <translation>Приеми</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="143"/>
+        <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
         <source>Automatic check for updates</source>
         <translation>Автоматична проверка за обновления</translation>
     </message>
@@ -7030,13 +8249,13 @@ Not all images have timestamps in the range between
 <context>
     <name>UserManual</name>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="54"/>
+        <location filename="../desktop-widgets/usermanual.cpp" line="54"/>
         <source>User manual</source>
         <translation>Ръководство за потребителя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usermanual.cpp" line="74"/>
-        <location filename="../qt-ui/usermanual.cpp" line="80"/>
+        <location filename="../desktop-widgets/usermanual.cpp" line="74"/>
+        <location filename="../desktop-widgets/usermanual.cpp" line="80"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Начъчника на Subsurface не може да бъде намерен</translation>
     </message>
@@ -7044,169 +8263,169 @@ Not all images have timestamps in the range between
 <context>
     <name>UserSurvey</name>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="44"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
         <location filename="../build/ui_usersurvey.h" line="151"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;С удоволствие бихме научили повече за нашите потребители, техните настройки и навици. Моля отделете минута да попълнете тази форма и да я изпратите на Subsurface екипа.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="115"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
         <location filename="../build/ui_usersurvey.h" line="156"/>
         <source>Other software/sources</source>
         <translation>Друг софтуер/източници</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="128"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
         <location filename="../build/ui_usersurvey.h" line="157"/>
         <source>Manually entering dives</source>
         <translation>Ръчно въвеждане на гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
         <translation>Потребителско изследване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="31"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="31"/>
         <location filename="../build/ui_usersurvey.h" line="150"/>
         <source>Subsurface user survey</source>
         <translation>Subsurface потребителско изследвание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="63"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
         <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
         <translation>Тех. гмуркач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="76"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="76"/>
         <location filename="../build/ui_usersurvey.h" line="153"/>
         <source>Recreational diver</source>
         <translation>Развлекателен гмуркач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="89"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="89"/>
         <location filename="../build/ui_usersurvey.h" line="154"/>
         <source>Dive planner</source>
         <translation>Гмуркачески плановик</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="102"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="102"/>
         <location filename="../build/ui_usersurvey.h" line="155"/>
         <source>Supported dive computer</source>
         <translation>Потдържан леководолазен компютър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="141"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
         <translation>Android/iPhone спътник приложение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="154"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="154"/>
         <location filename="../build/ui_usersurvey.h" line="159"/>
         <source>Any suggestions? (in English)</source>
         <translation>Някакви предложения (на Английски)?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="177"/>
+        <location filename="../desktop-widgets/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>Следната информация за вашата система ще бъде изпратена също.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="231"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="231"/>
         <location filename="../build/ui_usersurvey.h" line="161"/>
         <source>What kind of diver are you?</source>
         <translation>Какъв гмуркач сте?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.ui" line="270"/>
+        <location filename="../desktop-widgets/usersurvey.ui" line="270"/>
         <location filename="../build/ui_usersurvey.h" line="162"/>
         <source>Where are you importing data from?</source>
         <translation>От къде вмъквате данни?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="43"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
         <source>
 Operating system: %1</source>
         <translation>
 Операционна система: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="45"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="45"/>
         <source>
 CPU architecture: %1</source>
         <translation>
 CPU архитектура: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="47"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="47"/>
         <source>
 OS CPU architecture: %1</source>
         <translation>
 OS CPU архитектура %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="48"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="48"/>
         <source>
 Language: %1</source>
         <translation>
 Език: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="79"/>
         <source>Should we ask you later?</source>
         <translation>Да ви попитаме ли по-късно?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="80"/>
         <source>Don&apos;t ask me again</source>
         <translation>Не ме питайте отново</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="81"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="81"/>
         <source>Ask later</source>
         <translation>Попитайте ме отново</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
         <source>Submit user survey.</source>
         <translation>Изпрати потребителско изследване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="82"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Да ви попитаме отново?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="18"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
         <source>Send</source>
         <translation>Изпрати</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface не успя да изпрати потребителското изследване.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="107"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="107"/>
         <source>The following error occurred:</source>
         <translation>Грешка:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="108"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="108"/>
         <source>Please check your internet connection.</source>
         <translation>Моля проверете интернет връзката си.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="117"/>
         <source>Survey successfully submitted.</source>
         <translation>Потребителското изследване изпратено успешно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
+        <location filename="../desktop-widgets/usersurvey.cpp" line="122"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Настъпи грешка при проверката за обновления.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -7214,12 +8433,12 @@ Language: %1</source>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="79"/>
+        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="83"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="79"/>
+        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="83"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -7227,60 +8446,60 @@ Language: %1</source>
 <context>
     <name>WebServices</name>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="14"/>
+        <location filename="../desktop-widgets/webservices.ui" line="14"/>
         <location filename="../build/ui_webservices.h" line="129"/>
         <source>Web service connection</source>
         <translation>Връзка към уеб услуга</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="25"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/webservices.ui" line="32"/>
         <location filename="../build/ui_webservices.h" line="131"/>
         <source>Enter your ID here</source>
         <translation>Въведете вашия ID тук</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="44"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/webservices.ui" line="68"/>
         <location filename="../build/ui_webservices.h" line="133"/>
         <source>User ID</source>
         <translation>Потребителски ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="85"/>
+        <location filename="../desktop-widgets/webservices.ui" line="85"/>
         <location filename="../build/ui_webservices.h" line="135"/>
         <source>Save user ID locally?</source>
         <translation>Запази потребителски ID локално</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="92"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/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="312"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
         <source>Operation timed out</source>
         <translation>Времето за операцията изтече</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="333"/>
+        <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
         <source>Transferring data...</source>
         <translation>Трансфер на данни...</translation>
     </message>
@@ -7306,8 +8525,8 @@ Language: %1</source>
 <context>
     <name>WinBluetoothDeviceDiscoveryAgent</name>
     <message>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="525"/>
-        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="556"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="524"/>
+        <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="555"/>
         <source>No error</source>
         <translation>Няма грешка</translation>
     </message>
@@ -7315,15 +8534,15 @@ Language: %1</source>
 <context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1685"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1692"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1701"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
         <source>Failed!</source>
         <translation>Неуспешна операция!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1683"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1704"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
+        <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation>
     </message>
@@ -7413,37 +8632,37 @@ Maximum</source>
 <context>
     <name>getTextFromC</name>
     <message>
-        <location filename="../taxonomy.c" line="6"/>
+        <location filename="../core/taxonomy.c" line="6"/>
         <source>None</source>
         <translation>Няма</translation>
     </message>
     <message>
-        <location filename="../taxonomy.c" line="7"/>
+        <location filename="../core/taxonomy.c" line="7"/>
         <source>Ocean</source>
         <translation>Океан</translation>
     </message>
     <message>
-        <location filename="../taxonomy.c" line="8"/>
+        <location filename="../core/taxonomy.c" line="8"/>
         <source>Country</source>
         <translation>Държава</translation>
     </message>
     <message>
-        <location filename="../taxonomy.c" line="9"/>
+        <location filename="../core/taxonomy.c" line="9"/>
         <source>State</source>
         <translation>Щат</translation>
     </message>
     <message>
-        <location filename="../taxonomy.c" line="10"/>
+        <location filename="../core/taxonomy.c" line="10"/>
         <source>County</source>
         <translation>Държава</translation>
     </message>
     <message>
-        <location filename="../taxonomy.c" line="11"/>
+        <location filename="../core/taxonomy.c" line="11"/>
         <source>Town</source>
         <translation>Град</translation>
     </message>
     <message>
-        <location filename="../taxonomy.c" line="12"/>
+        <location filename="../core/taxonomy.c" line="12"/>
         <source>City</source>
         <translation>Град</translation>
     </message>
@@ -7451,7 +8670,7 @@ Maximum</source>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../libdivecomputer.c" line="674"/>
+        <location filename="../core/libdivecomputer.c" line="674"/>
         <source>Error parsing the header</source>
         <translation>Грешка при рaзряд на хедър</translation>
     </message>
@@ -7459,656 +8678,661 @@ Maximum</source>
 <context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="194"/>
+        <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>паскала</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="199"/>
-        <location filename="../qthelper.cpp" line="905"/>
+        <location filename="../core/dive.c" line="186"/>
+        <location filename="../core/qthelper.cpp" line="669"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="203"/>
-        <location filename="../qthelper.cpp" line="908"/>
+        <location filename="../core/dive.c" line="190"/>
+        <location filename="../core/qthelper.cpp" line="672"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="245"/>
+        <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
         <translation>кб.фута</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="282"/>
-        <location filename="../qthelper.cpp" line="787"/>
-        <location filename="../qthelper.cpp" line="802"/>
-        <location filename="../worldmap-save.c" line="44"/>
+        <location filename="../core/dive.c" line="269"/>
+        <location filename="../core/qthelper.cpp" line="590"/>
+        <location filename="../core/qthelper.cpp" line="605"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="287"/>
-        <location filename="../qthelper.cpp" line="790"/>
-        <location filename="../qthelper.cpp" line="804"/>
+        <location filename="../core/dive.c" line="274"/>
+        <location filename="../core/qthelper.cpp" line="593"/>
+        <location filename="../core/qthelper.cpp" line="607"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="310"/>
+        <location filename="../core/dive.c" line="297"/>
         <source>m/min</source>
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="312"/>
+        <location filename="../core/dive.c" line="299"/>
         <source>m/s</source>
         <translation>м/сек</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="317"/>
+        <location filename="../core/dive.c" line="304"/>
         <source>ft/min</source>
         <translation>фута/мин</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="319"/>
+        <location filename="../core/dive.c" line="306"/>
         <source>ft/s</source>
         <translation>фута/сек</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="338"/>
-        <location filename="../qthelper.cpp" line="813"/>
-        <location filename="../qthelper.cpp" line="823"/>
+        <location filename="../core/dive.c" line="325"/>
+        <location filename="../core/qthelper.cpp" line="616"/>
+        <location filename="../core/qthelper.cpp" line="626"/>
         <source>lbs</source>
         <translation>паунда</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="342"/>
-        <location filename="../qthelper.cpp" line="811"/>
-        <location filename="../qthelper.cpp" line="821"/>
+        <location filename="../core/dive.c" line="329"/>
+        <location filename="../core/qthelper.cpp" line="614"/>
+        <location filename="../core/qthelper.cpp" line="624"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1580"/>
+        <location filename="../core/dive.c" line="1772"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) или (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="482"/>
-        <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1400"/>
-        <location filename="../planner.c" line="1403"/>
+        <location filename="../core/divelist.c" line="484"/>
+        <location filename="../core/equipment.c" line="84"/>
+        <location filename="../core/planner.c" line="1411"/>
+        <location filename="../core/planner.c" line="1414"/>
         <source>air</source>
         <translation>въздух</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="194"/>
+        <location filename="../core/equipment.c" line="197"/>
         <source>integrated</source>
         <translation>вградена</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="195"/>
+        <location filename="../core/equipment.c" line="198"/>
         <source>belt</source>
         <translation>колан</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="196"/>
+        <location filename="../core/equipment.c" line="199"/>
         <source>ankle</source>
         <translation>глезен</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="197"/>
+        <location filename="../core/equipment.c" line="200"/>
         <source>backplate weight</source>
         <translation>нагръбна</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="198"/>
+        <location filename="../core/equipment.c" line="201"/>
         <source>clip-on</source>
         <translation>щипка</translation>
     </message>
     <message>
-        <location filename="../file.c" line="117"/>
-        <location filename="../file.c" line="456"/>
-        <location filename="../file.c" line="541"/>
-        <location filename="../file.c" line="936"/>
-        <location filename="../ostctools.c" line="80"/>
+        <location filename="../core/file.c" line="111"/>
+        <source>No dives in the input file &apos;%s&apos;</source>
+        <translation>Няма гмуркания във файла &apos;%s&apos;</translation>
+    </message>
+    <message>
+        <location filename="../core/file.c" line="121"/>
+        <location filename="../core/file.c" line="512"/>
+        <location filename="../core/file.c" line="597"/>
+        <location filename="../core/file.c" line="924"/>
+        <location filename="../core/file.c" line="1056"/>
+        <location filename="../core/ostctools.c" line="80"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="391"/>
+        <location filename="../core/file.c" line="398"/>
         <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>CSV файла %s не може да бъде отворен. Моля използвайте опцията &quot;Вмъкни регистър файлове&quot;.</translation>
     </message>
     <message>
-        <location filename="../file.c" line="458"/>
+        <location filename="../core/file.c" line="514"/>
         <source>Empty file &apos;%s&apos;</source>
         <translation>Празен файл &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="638"/>
+        <location filename="../core/file.c" line="694"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
         <translation>Проблем при Poseidon импорт: не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="674"/>
+        <location filename="../core/file.c" line="730"/>
         <source>Mouth piece position OC</source>
         <translation>Позиция на мундщук OC</translation>
     </message>
     <message>
-        <location filename="../file.c" line="678"/>
+        <location filename="../core/file.c" line="734"/>
         <source>Mouth piece position CC</source>
         <translation>Позиция на мундщук CC</translation>
     </message>
     <message>
-        <location filename="../file.c" line="682"/>
+        <location filename="../core/file.c" line="738"/>
         <source>Mouth piece position unknown</source>
         <translation>Позиция на мундщук - неопределена</translation>
     </message>
     <message>
-        <location filename="../file.c" line="686"/>
+        <location filename="../core/file.c" line="742"/>
         <source>Mouth piece position not connected</source>
         <translation>Позиция на мундщук - няма връзка</translation>
     </message>
     <message>
-        <location filename="../file.c" line="693"/>
+        <location filename="../core/file.c" line="749"/>
         <source>Power off</source>
         <translation>Захранване изключено</translation>
     </message>
     <message>
-        <location filename="../file.c" line="753"/>
+        <location filename="../core/file.c" line="809"/>
         <source>O₂ calibration failed</source>
         <translation>O₂ калибрацията не може да бъде извършена</translation>
     </message>
     <message>
-        <location filename="../file.c" line="755"/>
-        <location filename="../file.c" line="764"/>
+        <location filename="../core/file.c" line="811"/>
+        <location filename="../core/file.c" line="820"/>
         <source>O₂ calibration</source>
         <translation>O₂ калибрация</translation>
     </message>
     <message>
-        <location filename="../file.c" line="831"/>
+        <location filename="../core/file.c" line="887"/>
         <source>No matching DC found for file &apos;%s&apos;</source>
         <translation>Няма подходящ Л.К. за файла &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="198"/>
+        <location filename="../core/libdivecomputer.c" line="202"/>
         <source>none</source>
         <translation>няма</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="306"/>
-        <location filename="../cochran.c" line="312"/>
-        <location filename="../cochran.c" line="382"/>
-        <location filename="../libdivecomputer.c" line="198"/>
+        <location filename="../core/cochran.c" line="309"/>
+        <location filename="../core/cochran.c" line="315"/>
+        <location filename="../core/cochran.c" line="385"/>
+        <location filename="../core/libdivecomputer.c" line="202"/>
         <source>deco stop</source>
         <translation>деко. стоп</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="339"/>
-        <location filename="../file.c" line="699"/>
+        <location filename="../core/cochran.c" line="342"/>
+        <location filename="../core/file.c" line="755"/>
         <source>battery</source>
         <translation>батерия</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="367"/>
-        <location filename="../cochran.c" line="406"/>
-        <location filename="../libdivecomputer.c" line="198"/>
+        <location filename="../core/cochran.c" line="370"/>
+        <location filename="../core/cochran.c" line="409"/>
+        <location filename="../core/libdivecomputer.c" line="202"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="333"/>
-        <location filename="../cochran.c" line="387"/>
-        <location filename="../file.c" line="721"/>
-        <location filename="../libdivecomputer.c" line="198"/>
+        <location filename="../core/cochran.c" line="336"/>
+        <location filename="../core/cochran.c" line="390"/>
+        <location filename="../core/file.c" line="777"/>
+        <location filename="../core/libdivecomputer.c" line="202"/>
         <source>ascent</source>
         <translation>покачване</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="376"/>
-        <location filename="../cochran.c" line="423"/>
-        <location filename="../libdivecomputer.c" line="198"/>
+        <location filename="../core/cochran.c" line="379"/>
+        <location filename="../core/cochran.c" line="426"/>
+        <location filename="../core/libdivecomputer.c" line="202"/>
         <source>ceiling</source>
         <translation>таван</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="198"/>
+        <location filename="../core/libdivecomputer.c" line="202"/>
         <source>workload</source>
         <translation>натовареност</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="392"/>
-        <location filename="../libdivecomputer.c" line="199"/>
+        <location filename="../core/cochran.c" line="395"/>
+        <location filename="../core/libdivecomputer.c" line="203"/>
         <source>transmitter</source>
         <translation>предавател</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="199"/>
+        <location filename="../core/libdivecomputer.c" line="203"/>
         <source>violation</source>
         <translation>нарушение</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="199"/>
+        <location filename="../core/libdivecomputer.c" line="203"/>
         <source>bookmark</source>
         <translation>бележка</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="199"/>
+        <location filename="../core/libdivecomputer.c" line="203"/>
         <source>surface</source>
         <translation>повърхност</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="199"/>
+        <location filename="../core/libdivecomputer.c" line="203"/>
         <source>safety stop</source>
         <translation>безопасен стоп</translation>
     </message>
     <message>
-        <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="200"/>
-        <location filename="../libdivecomputer.c" line="203"/>
+        <location filename="../core/cochran.c" line="365"/>
+        <location filename="../core/cochran.c" line="414"/>
+        <location filename="../core/cochran.c" line="421"/>
+        <location filename="../core/file.c" line="868"/>
+        <location filename="../core/libdivecomputer.c" line="204"/>
+        <location filename="../core/libdivecomputer.c" line="207"/>
         <source>gaschange</source>
         <translation>смяна на газ</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../core/libdivecomputer.c" line="204"/>
         <source>safety stop (voluntary)</source>
         <translation>безопасен стоп (свободен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="200"/>
+        <location filename="../core/libdivecomputer.c" line="204"/>
         <source>safety stop (mandatory)</source>
         <translation>безопасен стоп (задължителен)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="201"/>
+        <location filename="../core/libdivecomputer.c" line="205"/>
         <source>deepstop</source>
         <translation>дълбочина на спиране</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="201"/>
+        <location filename="../core/libdivecomputer.c" line="205"/>
         <source>ceiling (safety stop)</source>
         <translation>таван (безопасен стоп)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="201"/>
+        <location filename="../core/libdivecomputer.c" line="205"/>
         <source>divetime</source>
         <translation>време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="201"/>
+        <location filename="../core/libdivecomputer.c" line="205"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>под</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="350"/>
-        <location filename="../libdivecomputer.c" line="202"/>
+        <location filename="../core/cochran.c" line="353"/>
+        <location filename="../core/libdivecomputer.c" line="206"/>
         <source>maxdepth</source>
         <translation>макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="345"/>
-        <location filename="../libdivecomputer.c" line="202"/>
+        <location filename="../core/cochran.c" line="348"/>
+        <location filename="../core/libdivecomputer.c" line="206"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="202"/>
+        <location filename="../core/libdivecomputer.c" line="206"/>
         <source>airtime</source>
         <translation>време за въздух</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="202"/>
+        <location filename="../core/libdivecomputer.c" line="206"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="202"/>
+        <location filename="../core/libdivecomputer.c" line="206"/>
         <source>heading</source>
         <translation>посока</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="355"/>
-        <location filename="../cochran.c" line="401"/>
-        <location filename="../libdivecomputer.c" line="202"/>
+        <location filename="../core/cochran.c" line="358"/>
+        <location filename="../core/cochran.c" line="404"/>
+        <location filename="../core/libdivecomputer.c" line="206"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="207"/>
         <source>tissue level warning</source>
         <translation>внимание: ниво на тъканта</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="203"/>
+        <location filename="../core/libdivecomputer.c" line="207"/>
         <source>non stop time</source>
         <translation>нон стоп време</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="220"/>
+        <location filename="../core/libdivecomputer.c" line="224"/>
         <source>invalid event number</source>
         <translation>грешен номер на събитие</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="658"/>
+        <location filename="../core/libdivecomputer.c" line="658"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Не може да бъде създаден разряд за %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="664"/>
+        <location filename="../core/libdivecomputer.c" line="664"/>
         <source>Error registering the data</source>
         <translation>Грешка при регистриране на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="495"/>
+        <location filename="../core/libdivecomputer.c" line="495"/>
         <source>Error parsing the datetime</source>
         <translation>Грешка при разряд на дата и час</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="513"/>
+        <location filename="../core/libdivecomputer.c" line="513"/>
         <source>Dive %d: %s</source>
         <translation>Гмуркане №%d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="519"/>
+        <location filename="../core/libdivecomputer.c" line="519"/>
         <source>Error parsing the divetime</source>
         <translation>Грешка при рaзряд на време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>Грешка при рaзряд на максимална дълбочина</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>Грешка при рaзряд на температура</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="568"/>
+        <location filename="../core/libdivecomputer.c" line="568"/>
         <source>Error parsing the gas mix count</source>
         <translation>Грешка при рaзряд на газ микс брой</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="580"/>
+        <location filename="../core/libdivecomputer.c" line="580"/>
         <source>Error obtaining water salinity</source>
         <translation>Грешка при прием на водна соленост</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="589"/>
+        <location filename="../core/libdivecomputer.c" line="589"/>
         <source>Error obtaining surface pressure</source>
         <translation>Грешка при прием на повърхностно налягане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="614"/>
+        <location filename="../core/libdivecomputer.c" line="614"/>
         <source>Error obtaining divemode</source>
         <translation>Грешка при прием на режим на гмуркане</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="634"/>
+        <location filename="../core/libdivecomputer.c" line="634"/>
         <source>Error parsing the gas mix</source>
         <translation>Грешка при рaзряд на газ микс</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>Грешка при рaзряд на стойности</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="821"/>
+        <location filename="../core/libdivecomputer.c" line="822"/>
         <source>Event: waiting for user action</source>
         <translation>Събитие: изчаквание на действие от потребителя</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="829"/>
+        <location filename="../core/libdivecomputer.c" line="830"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="893"/>
+        <location filename="../core/libdivecomputer.c" line="894"/>
         <source>Error registering the event handler.</source>
         <translation>Грешка при регистриране на направление за събития</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="898"/>
+        <location filename="../core/libdivecomputer.c" line="899"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Грешка при регистриране на направление за отменяне</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="919"/>
+        <location filename="../core/libdivecomputer.c" line="920"/>
         <source>Dive data import error</source>
         <translation>Грешка при вход на данни</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="958"/>
+        <location filename="../core/libdivecomputer.c" line="959"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Не може да бъде създаден libdivecomputer контекст</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="965"/>
+        <location filename="../core/libdivecomputer.c" line="966"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Не може да бъдe отворен %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="989"/>
+        <location filename="../core/libdivecomputer.c" line="992"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Недостатъчни привилегии да бъде отврено устройсто %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="514"/>
+        <location filename="../core/parse-xml.c" line="517"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Неразпозната стойност за проценти %s
 </translation>
     </message>
     <message>
-        <location filename="../load-git.c" line="189"/>
-        <location filename="../parse-xml.c" line="1232"/>
+        <location filename="../core/load-git.c" line="194"/>
+        <location filename="../core/parse-xml.c" line="1238"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
         <translation>повече от една GPS локации за това място на гмуркане; също така %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2022"/>
+        <location filename="../core/parse-xml.c" line="2044"/>
         <source>Failed to parse &apos;%s&apos;</source>
         <translation>Не може да бъде напревен разбор на &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="3631"/>
+        <location filename="../core/parse-xml.c" line="3741"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Не може да бъде отворен стилов файл %s</translation>
     </message>
     <message>
-        <location filename="../equipment.c" line="83"/>
+        <location filename="../core/equipment.c" line="86"/>
         <source>EAN%d</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1021"/>
-        <location filename="../planner.c" line="1173"/>
+        <location filename="../core/planner.c" line="1032"/>
+        <location filename="../core/planner.c" line="1184"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Не може да бъде намерен газ %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="372"/>
+        <location filename="../core/planner.c" line="368"/>
         <source>Too many gas mixes</source>
         <translation>Твърде много газови смеси</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="571"/>
+        <location filename="../core/planner.c" line="568"/>
         <source>Decompression calculation aborted due to excessive time</source>
         <translation>Калкулирането на декомпресия е прекратено заради дълга продължителност</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="595"/>
+        <location filename="../core/planner.c" line="592"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="599"/>
+        <location filename="../core/planner.c" line="596"/>
         <source>depth</source>
         <translation>дълбочина</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="605"/>
+        <location filename="../core/planner.c" line="602"/>
         <source>runtime</source>
         <translation>времетраене</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="602"/>
+        <location filename="../core/planner.c" line="599"/>
         <source>duration</source>
         <translation>продължителност</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="557"/>
+        <location filename="../core/planner.c" line="554"/>
         <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
         <translation>ВНИМАНИЕ: ТОВА Е НОВА ИМПЛЕМЕНТАЦИЯ НА АЛГОРИТЪМА %s И ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО! СИЛНО ПРЕПОРЪЧВАМЕ ДА НЕ БАЗИРАТЕ ГМУРКАНИЯТА СИ САМО НА ТЕЗИ ДАННИ!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="608"/>
+        <location filename="../core/planner.c" line="605"/>
         <source>gas</source>
         <translation>газ</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="651"/>
+        <location filename="../core/planner.c" line="648"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="659"/>
+        <location filename="../core/planner.c" line="656"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="672"/>
+        <location filename="../core/planner.c" line="669"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="679"/>
+        <location filename="../core/planner.c" line="676"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="712"/>
+        <location filename="../core/planner.c" line="721"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="715"/>
-        <location filename="../planner.c" line="719"/>
+        <location filename="../core/planner.c" line="724"/>
+        <location filename="../core/planner.c" line="728"/>
         <source>%3dmin</source>
         <translation>%3dмин</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="728"/>
-        <location filename="../planner.c" line="740"/>
+        <location filename="../core/planner.c" line="737"/>
+        <location filename="../core/planner.c" line="749"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="763"/>
+        <location filename="../core/planner.c" line="772"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Превключи газ към %s (SP = %.1f бара)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="765"/>
+        <location filename="../core/planner.c" line="774"/>
         <source>Switch gas to %s</source>
         <translation>Превключи газ на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="783"/>
+        <location filename="../core/planner.c" line="793"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="785"/>
+        <location filename="../core/planner.c" line="795"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="789"/>
+        <location filename="../core/planner.c" line="799"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Консумация на газ (CCR крака включени):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="791"/>
+        <location filename="../core/planner.c" line="801"/>
         <source>Gas consumption:</source>
         <translation>Консумация на газ:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="573"/>
-        <location filename="../planner.c" line="811"/>
-        <location filename="../planner.c" line="816"/>
-        <location filename="../planner.c" line="841"/>
-        <location filename="../planner.c" line="851"/>
+        <location filename="../core/planner.c" line="570"/>
+        <location filename="../core/planner.c" line="821"/>
+        <location filename="../core/planner.c" line="826"/>
+        <location filename="../core/planner.c" line="851"/>
+        <location filename="../core/planner.c" line="861"/>
         <source>Warning:</source>
         <translation>Предупреждение:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="583"/>
+        <location filename="../core/planner.c" line="580"/>
         <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
         <translation>базиран на Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="587"/>
+        <location filename="../core/planner.c" line="584"/>
         <source>based on VPM-B at nominal conservatism</source>
         <translation>базирано на VPM-B с номинален консерватизъм</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="589"/>
+        <location filename="../core/planner.c" line="586"/>
         <source>based on VPM-B at +%d conservatism</source>
         <translation>базирано на VPM-B с +%d консерватизъм</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="591"/>
+        <location filename="../core/planner.c" line="588"/>
         <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
         <translation>режим за развлечение базиран на Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="812"/>
+        <location filename="../core/planner.c" line="822"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>има повече газ от този на разположение в избраната бултилка</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="817"/>
+        <location filename="../core/planner.c" line="827"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="819"/>
+        <location filename="../core/planner.c" line="829"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s от %s (%.0f%s/%.0f%s в планирано покачване)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="821"/>
+        <location filename="../core/planner.c" line="831"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s по време на плануваното изкачване) на %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="838"/>
+        <location filename="../core/planner.c" line="848"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="848"/>
+        <location filename="../core/planner.c" line="858"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>ниска pO₂ стойност %.2f към %d:%02u с газ %s при дълбочина %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1408"/>
+        <location filename="../core/planner.c" line="1419"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1133"/>
+        <location filename="../core/profile.c" line="1280"/>
         <source>@: %d:%02d
 D: %.1f%s
 </source>
@@ -8117,70 +9341,70 @@ D: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1136"/>
+        <location filename="../core/profile.c" line="1283"/>
         <source>P: %d%s
 </source>
         <translation>P: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1140"/>
+        <location filename="../core/profile.c" line="1287"/>
         <source>T: %.1f%s
 </source>
         <translation>T: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1146"/>
+        <location filename="../core/profile.c" line="1293"/>
         <source>V: %.1f%s
 </source>
         <translation>V: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1149"/>
+        <location filename="../core/profile.c" line="1296"/>
         <source>SAC: %.*f%s/min
 </source>
         <translation>SAC: %.*f%s/мин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1151"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>CNS: %u%%
 </source>
         <translation>CNS: %u%%
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1153"/>
+        <location filename="../core/profile.c" line="1300"/>
         <source>pO%s: %.2fbar
 </source>
         <translation>pO%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1155"/>
+        <location filename="../core/profile.c" line="1302"/>
         <source>pN%s: %.2fbar
 </source>
         <translation>pN%s: %.2fбара
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1157"/>
+        <location filename="../core/profile.c" line="1304"/>
         <source>pHe: %.2fbar
 </source>
         <translation>pHe: %.2fбар
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1160"/>
+        <location filename="../core/profile.c" line="1307"/>
         <source>MOD: %d%s
 </source>
         <translation>MOD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1167"/>
+        <location filename="../core/profile.c" line="1314"/>
         <source>EAD: %d%s
 EADD: %d%s
 </source>
@@ -8189,7 +9413,7 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1171"/>
+        <location filename="../core/profile.c" line="1318"/>
         <source>END: %d%s
 EADD: %d%s
 </source>
@@ -8198,14 +9422,14 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1184"/>
+        <location filename="../core/profile.c" line="1331"/>
         <source>Safetystop: %umin @ %.0f%s
 </source>
         <translation>Стоп: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1187"/>
+        <location filename="../core/profile.c" line="1334"/>
         <source>Safetystop: unkn time @ %.0f%s
 </source>
         <translation>Стоп: неопр. време @ %.0f%s
@@ -8213,621 +9437,621 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1192"/>
+        <location filename="../core/profile.c" line="1339"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>Deco: %uмин @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1195"/>
+        <location filename="../core/profile.c" line="1342"/>
         <source>Deco: unkn time @ %.0f%s
 </source>
         <translation>Deco: неопр. време @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../core/profile.c" line="1346"/>
         <source>In deco
 </source>
         <translation>В Deco
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1201"/>
+        <location filename="../core/profile.c" line="1348"/>
         <source>NDL: %umin
 </source>
         <translation>NDL: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1204"/>
+        <location filename="../core/profile.c" line="1351"/>
         <source>TTS: %umin
 </source>
         <translation>TTS: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1207"/>
+        <location filename="../core/profile.c" line="1354"/>
         <source>Deco: %umin @ %.0f%s (calc)
 </source>
         <translation>Deco: %uмин @ %.0f%s (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../core/profile.c" line="1362"/>
         <source>In deco (calc)
 </source>
         <translation>В Deco (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1218"/>
+        <location filename="../core/profile.c" line="1365"/>
         <source>NDL: %umin (calc)
 </source>
         <translation>NDL: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1220"/>
+        <location filename="../core/profile.c" line="1367"/>
         <source>NDL: &gt;2h (calc)
 </source>
         <translation>NDL: &gt;2ч (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1224"/>
+        <location filename="../core/profile.c" line="1371"/>
         <source>TTS: %umin (calc)
 </source>
         <translation>TTS: %uмин (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1226"/>
+        <location filename="../core/profile.c" line="1373"/>
         <source>TTS: &gt;2h (calc)
 </source>
         <translation>TTS: &gt;2ч (калк.)
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1229"/>
+        <location filename="../core/profile.c" line="1376"/>
         <source>RBT: %umin
 </source>
         <translation>RBT: %uмин
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1232"/>
+        <location filename="../core/profile.c" line="1379"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Калкулиран таван %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1238"/>
+        <location filename="../core/profile.c" line="1385"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
         <translation>Тъкан %.0fмин: %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1244"/>
+        <location filename="../core/profile.c" line="1391"/>
         <source>heartbeat: %d
 </source>
         <translation>пулс: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1246"/>
+        <location filename="../core/profile.c" line="1393"/>
         <source>bearing: %d
 </source>
         <translation>лагер: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1249"/>
+        <location filename="../core/profile.c" line="1396"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>средна дълбочина до %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1344"/>
+        <location filename="../core/profile.c" line="1491"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d мин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1348"/>
-        <location filename="../profile.c" line="1352"/>
-        <location filename="../profile.c" line="1356"/>
+        <location filename="../core/profile.c" line="1495"/>
+        <location filename="../core/profile.c" line="1499"/>
+        <location filename="../core/profile.c" line="1503"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1360"/>
+        <location filename="../core/profile.c" line="1507"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1364"/>
+        <location filename="../core/profile.c" line="1511"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1368"/>
-        <location filename="../profile.c" line="1372"/>
+        <location filename="../core/profile.c" line="1515"/>
+        <location filename="../core/profile.c" line="1519"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1379"/>
+        <location filename="../core/profile.c" line="1526"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="309"/>
+        <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
         <translation>%1км</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="311"/>
+        <location filename="../core/qthelper.cpp" line="69"/>
         <source>%1m</source>
         <translation>%1м</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="315"/>
+        <location filename="../core/qthelper.cpp" line="73"/>
         <source>%1mi</source>
         <translation>%1mi</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="317"/>
+        <location filename="../core/qthelper.cpp" line="75"/>
         <source>%1yd</source>
         <translation>%1yd</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="863"/>
+        <location filename="../core/qthelper.cpp" line="635"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="866"/>
+        <location filename="../core/qthelper.cpp" line="638"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../core/dive.c" line="23"/>
         <source>boat</source>
         <translation>кораб</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../core/dive.c" line="23"/>
         <source>shore</source>
         <translation>бряг</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="456"/>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../core/datatrak.c" line="459"/>
+        <location filename="../core/dive.c" line="23"/>
         <source>drift</source>
         <translation>дрейф</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../core/dive.c" line="24"/>
         <source>deep</source>
         <translation>дълбоко</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../core/dive.c" line="24"/>
         <source>cavern</source>
         <translation>каверна</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="440"/>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../core/datatrak.c" line="443"/>
+        <location filename="../core/dive.c" line="24"/>
         <source>ice</source>
         <translation>лед</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="442"/>
+        <location filename="../core/datatrak.c" line="445"/>
         <source>search</source>
         <translation>търсене</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="452"/>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../core/datatrak.c" line="455"/>
+        <location filename="../core/dive.c" line="25"/>
         <source>wreck</source>
         <translation>останки</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="438"/>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../core/datatrak.c" line="441"/>
+        <location filename="../core/dive.c" line="25"/>
         <source>cave</source>
         <translation>пещера</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../core/dive.c" line="25"/>
         <source>altitude</source>
         <translation>височина</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="26"/>
+        <location filename="../core/dive.c" line="26"/>
         <source>pool</source>
         <translation>басейн</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="26"/>
+        <location filename="../core/dive.c" line="26"/>
         <source>lake</source>
         <translation>езеро</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="454"/>
-        <location filename="../dive.c" line="26"/>
+        <location filename="../core/datatrak.c" line="457"/>
+        <location filename="../core/dive.c" line="26"/>
         <source>river</source>
         <translation>река</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="436"/>
-        <location filename="../dive.c" line="27"/>
+        <location filename="../core/datatrak.c" line="439"/>
+        <location filename="../core/dive.c" line="27"/>
         <source>night</source>
         <translation>вечер</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="150"/>
+        <location filename="../core/datatrak.c" line="153"/>
         <source>Error: the file does not appear to be a DATATRAK divelog</source>
         <translation>Грешка: файлът не е DATATRAK регистър</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="283"/>
+        <location filename="../core/datatrak.c" line="286"/>
         <source>clear</source>
         <translation>чисто</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="286"/>
+        <location filename="../core/datatrak.c" line="289"/>
         <source>misty</source>
         <translation>мъгляво</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="289"/>
+        <location filename="../core/datatrak.c" line="292"/>
         <source>fog</source>
         <translation>мъгла</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="292"/>
+        <location filename="../core/datatrak.c" line="295"/>
         <source>rain</source>
         <translation>дъжд</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="295"/>
+        <location filename="../core/datatrak.c" line="298"/>
         <source>storm</source>
         <translation>буря</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="298"/>
+        <location filename="../core/datatrak.c" line="301"/>
         <source>snow</source>
         <translation>сняг</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="318"/>
+        <location filename="../core/datatrak.c" line="321"/>
         <source>No suit</source>
         <translation>Няма костюм</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="321"/>
+        <location filename="../core/datatrak.c" line="324"/>
         <source>Shorty</source>
         <translation>Шорти</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="324"/>
+        <location filename="../core/datatrak.c" line="327"/>
         <source>Combi</source>
         <translation>Комби</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="327"/>
+        <location filename="../core/datatrak.c" line="330"/>
         <source>Wet suit</source>
         <translation>Мокър костюм</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="330"/>
+        <location filename="../core/datatrak.c" line="333"/>
         <source>Semidry suit</source>
         <translation>Полумокър костюм</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="333"/>
+        <location filename="../core/datatrak.c" line="336"/>
         <source>Dry suit</source>
         <translation>Сух костюм</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="393"/>
+        <location filename="../core/datatrak.c" line="396"/>
         <source>no stop</source>
         <translation>няма стоп</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="397"/>
+        <location filename="../core/datatrak.c" line="400"/>
         <source>single ascent</source>
         <translation>единично изкачване</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="399"/>
+        <location filename="../core/datatrak.c" line="402"/>
         <source>multiple ascent</source>
         <translation>множествено изкачване</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="401"/>
-        <location filename="../dive.c" line="27"/>
+        <location filename="../core/datatrak.c" line="404"/>
+        <location filename="../core/dive.c" line="27"/>
         <source>fresh</source>
         <translation>нов</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="403"/>
+        <location filename="../core/datatrak.c" line="406"/>
         <source>salt water</source>
         <translation>солена вода</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="428"/>
+        <location filename="../core/datatrak.c" line="431"/>
         <source>sight seeing</source>
         <translation>забележителности</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="430"/>
+        <location filename="../core/datatrak.c" line="433"/>
         <source>club dive</source>
         <translation>клубно гмуркане</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="434"/>
+        <location filename="../core/datatrak.c" line="437"/>
         <source>instruction</source>
         <translation>инструкция</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="460"/>
+        <location filename="../core/datatrak.c" line="463"/>
         <source>other</source>
         <translation>друго</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="471"/>
+        <location filename="../core/datatrak.c" line="474"/>
         <source>Other activities</source>
         <translation>Други активности</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="495"/>
+        <location filename="../core/datatrak.c" line="498"/>
         <source>Datatrak/Wlog notes</source>
         <translation>Datatrak/Wlog бележки</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="534"/>
+        <location filename="../core/datatrak.c" line="537"/>
         <source>Manually entered dive</source>
         <translation>Ръчно въведено гмуркане</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="585"/>
+        <location filename="../core/datatrak.c" line="588"/>
         <source>Unknown</source>
         <translation>Непознато</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="671"/>
+        <location filename="../core/datatrak.c" line="674"/>
         <source>Error: couldn&apos;t open the file %s</source>
         <translation>Грешка: файла %s не може да бъде отворен</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="684"/>
+        <location filename="../core/datatrak.c" line="687"/>
         <source>Error: no dive</source>
         <translation>Грешка: няма гмуркане</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="27"/>
+        <location filename="../core/dive.c" line="27"/>
         <source>student</source>
         <translation>студент</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="458"/>
-        <location filename="../dive.c" line="28"/>
+        <location filename="../core/datatrak.c" line="461"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>photo</source>
         <translation>снимка</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="28"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>video</source>
         <translation>видео</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="432"/>
-        <location filename="../dive.c" line="28"/>
+        <location filename="../core/datatrak.c" line="435"/>
+        <location filename="../core/dive.c" line="28"/>
         <source>instructor</source>
         <translation>инструктор</translation>
     </message>
     <message>
-        <location filename="../datatrak.c" line="395"/>
-        <location filename="../dive.c" line="29"/>
+        <location filename="../core/datatrak.c" line="398"/>
+        <location filename="../core/dive.c" line="29"/>
         <source>deco</source>
         <translation>деко</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="33"/>
+        <location filename="../core/dive.c" line="33"/>
         <source>OC-gas</source>
         <translation>OC-газ</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="33"/>
+        <location filename="../core/dive.c" line="33"/>
         <source>diluent</source>
         <translation>разредител</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="33"/>
-        <location filename="../equipment.c" line="85"/>
-        <location filename="../planner.c" line="1404"/>
-        <location filename="../planner.c" line="1407"/>
+        <location filename="../core/dive.c" line="33"/>
+        <location filename="../core/equipment.c" line="88"/>
+        <location filename="../core/planner.c" line="1415"/>
+        <location filename="../core/planner.c" line="1418"/>
         <source>oxygen</source>
         <translation>кислород</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="240"/>
+        <location filename="../core/dive.c" line="227"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="214"/>
+        <location filename="../core/statistics.c" line="239"/>
         <source>more than %d days</source>
         <translation>повече от %d дни</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="221"/>
+        <location filename="../core/statistics.c" line="246"/>
         <source>%dd %dh %dmin</source>
         <translation>%dд %dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="224"/>
+        <location filename="../core/statistics.c" line="249"/>
         <source>%dmin %dsecs</source>
-        <translation type="unfinished"/>
+        <translation>%dмин. %dсек.</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="226"/>
+        <location filename="../core/statistics.c" line="251"/>
         <source>%dh %dmin</source>
         <translation>%dч %dмин</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="238"/>
+        <location filename="../core/statistics.c" line="263"/>
         <source>for dives #</source>
         <translation>за гмуркания №</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="244"/>
+        <location filename="../core/statistics.c" line="269"/>
         <source>for selected dives</source>
         <translation>за избраните гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="279"/>
+        <location filename="../core/statistics.c" line="304"/>
         <source>for dive #%d</source>
         <translation>за гмуркане №%d</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="281"/>
+        <location filename="../core/statistics.c" line="306"/>
         <source>for selected dive</source>
         <translation>за избраните гмуркане</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="283"/>
+        <location filename="../core/statistics.c" line="308"/>
         <source>for all dives</source>
         <translation>за вички гмуркания</translation>
     </message>
     <message>
-        <location filename="../statistics.c" line="285"/>
+        <location filename="../core/statistics.c" line="310"/>
         <source>(no dives)</source>
         <translation>(няма гмуркания)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Mon</source>
         <translation>Пон</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Thu</source>
         <translation>Чет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="114"/>
+        <location filename="../core/subsurfacestartup.c" line="120"/>
         <source>Sat</source>
         <translation>Съб</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="123"/>
+        <location filename="../core/subsurfacestartup.c" line="129"/>
         <source>Jan</source>
         <translation>Ян</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="123"/>
+        <location filename="../core/subsurfacestartup.c" line="129"/>
         <source>Feb</source>
         <translation>Фев</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="123"/>
+        <location filename="../core/subsurfacestartup.c" line="129"/>
         <source>Mar</source>
         <translation>Март</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="123"/>
+        <location filename="../core/subsurfacestartup.c" line="129"/>
         <source>Apr</source>
         <translation>Апр</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="123"/>
+        <location filename="../core/subsurfacestartup.c" line="129"/>
         <source>May</source>
         <translation>Май</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="123"/>
+        <location filename="../core/subsurfacestartup.c" line="129"/>
         <source>Jun</source>
         <translation>Юни</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="124"/>
+        <location filename="../core/subsurfacestartup.c" line="130"/>
         <source>Jul</source>
         <translation>Юли</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="124"/>
+        <location filename="../core/subsurfacestartup.c" line="130"/>
         <source>Aug</source>
         <translation>Авг</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="124"/>
+        <location filename="../core/subsurfacestartup.c" line="130"/>
         <source>Sep</source>
         <translation>Сеп</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="124"/>
+        <location filename="../core/subsurfacestartup.c" line="130"/>
         <source>Oct</source>
         <translation>Окт</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="124"/>
+        <location filename="../core/subsurfacestartup.c" line="130"/>
         <source>Nov</source>
         <translation>Нов</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="124"/>
+        <location filename="../core/subsurfacestartup.c" line="130"/>
         <source>Dec</source>
         <translation>Дек</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="187"/>
-        <location filename="../parse-xml.c" line="3177"/>
-        <location filename="../uemis-downloader.c" line="133"/>
+        <location filename="../core/libdivecomputer.c" line="191"/>
+        <location filename="../core/parse-xml.c" line="3284"/>
+        <location filename="../core/uemis-downloader.c" line="134"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="464"/>
+        <location filename="../core/uemis-downloader.c" line="467"/>
         <source>data</source>
         <translation>данни</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="444"/>
+        <location filename="../core/uemis-downloader.c" line="447"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="27"/>
+        <location filename="../core/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>
@@ -8836,7 +10060,7 @@ and click &apos;Retry&apos;</source>
 и опитайте пак.</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="28"/>
+        <location filename="../core/uemis-downloader.c" line="28"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
@@ -8845,641 +10069,867 @@ and click Retry</source>
 и опитайте отново.</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="29"/>
+        <location filename="../core/uemis-downloader.c" line="29"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Кратък запис в req.txt файл.
 Uemis Zurich включен ли е правилно?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="30"/>
+        <location filename="../core/uemis-downloader.c" line="30"/>
         <source>No dives to download.</source>
         <translation>Няма гмуркания за теглене</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="492"/>
+        <location filename="../core/uemis-downloader.c" line="495"/>
         <source>divelog #</source>
         <translation>divelog #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="494"/>
+        <location filename="../core/uemis-downloader.c" line="497"/>
         <source>divespot #</source>
         <translation>divespot #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="496"/>
+        <location filename="../core/uemis-downloader.c" line="499"/>
         <source>details for #</source>
         <translation>details for #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="697"/>
+        <location filename="../core/uemis-downloader.c" line="702"/>
         <source>wetsuit</source>
         <translation>мокър костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="697"/>
+        <location filename="../core/uemis-downloader.c" line="702"/>
         <source>semidry</source>
         <translation>полусух</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="697"/>
+        <location filename="../core/uemis-downloader.c" line="702"/>
         <source>drysuit</source>
         <translation>сух костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="698"/>
+        <location filename="../core/uemis-downloader.c" line="703"/>
         <source>shorty</source>
         <translation>къс</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="698"/>
+        <location filename="../core/uemis-downloader.c" line="703"/>
         <source>vest</source>
         <translation>жилетка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="698"/>
+        <location filename="../core/uemis-downloader.c" line="703"/>
         <source>long john</source>
         <translation>лонг джон</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="698"/>
+        <location filename="../core/uemis-downloader.c" line="703"/>
         <source>jacket</source>
         <translation>яке</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="698"/>
+        <location filename="../core/uemis-downloader.c" line="703"/>
         <source>full suit</source>
         <translation>пълен косюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="698"/>
+        <location filename="../core/uemis-downloader.c" line="703"/>
         <source>2 pcs full suit</source>
         <translation>2 за цял костюм</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="699"/>
+        <location filename="../core/uemis-downloader.c" line="704"/>
         <source>membrane</source>
         <translation>мембрана</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="1211"/>
+        <location filename="../core/uemis-downloader.c" line="1234"/>
         <source>Initialise communication</source>
         <translation>Започни връзка</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="1214"/>
+        <location filename="../core/uemis-downloader.c" line="1237"/>
         <source>Uemis init failed</source>
         <translation>Uemis не може да бъде зареден</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="1226"/>
+        <location filename="../core/uemis-downloader.c" line="1249"/>
         <source>Start download</source>
         <translation>Започни теглене</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../core/uemis.c" line="201"/>
         <source>Safety stop violation</source>
         <translation>Нарушение на безопасно спиране</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="203"/>
+        <location filename="../core/uemis.c" line="203"/>
         <source>Speed alarm</source>
         <translation>Тревога: скорост</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../core/uemis.c" line="206"/>
         <source>Speed warning</source>
         <translation>Внимание: скорост</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="208"/>
+        <location filename="../core/uemis.c" line="208"/>
         <source>pO₂ green warning</source>
         <translation>pO₂ зелена тревога</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="211"/>
+        <location filename="../core/uemis.c" line="211"/>
         <source>pO₂ ascend warning</source>
         <translation>pO₂ тревога за изкачване</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="213"/>
+        <location filename="../core/uemis.c" line="213"/>
         <source>pO₂ ascend alarm</source>
         <translation>pO₂ аларма за изкачване</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="217"/>
+        <location filename="../core/uemis.c" line="217"/>
         <source>Tank pressure info</source>
         <translation>Информация за налагане на бутилка</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="219"/>
+        <location filename="../core/uemis.c" line="219"/>
         <source>RGT warning</source>
         <translation>Внимание: оставащо газ-време</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="221"/>
+        <location filename="../core/uemis.c" line="221"/>
         <source>RGT alert</source>
         <translation>Тревога: оставащо газ-време</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="223"/>
+        <location filename="../core/uemis.c" line="223"/>
         <source>Tank change suggested</source>
         <translation>Предложение за смяна на резервоар</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="225"/>
+        <location filename="../core/uemis.c" line="225"/>
         <source>Depth limit exceeded</source>
         <translation>Надминат лимит на дълбочина</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="227"/>
+        <location filename="../core/uemis.c" line="227"/>
         <source>Max deco time warning</source>
         <translation>Внимание: максимално време на декомпресия</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="229"/>
+        <location filename="../core/uemis.c" line="229"/>
         <source>Dive time info</source>
         <translation>Времева информация за гмуркане</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="231"/>
+        <location filename="../core/uemis.c" line="231"/>
         <source>Dive time alert</source>
         <translation>Тревога: време за гмуркане</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="233"/>
+        <location filename="../core/uemis.c" line="233"/>
         <source>Marker</source>
         <translation>Маркер</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="235"/>
+        <location filename="../core/uemis.c" line="235"/>
         <source>No tank data</source>
         <translation>Няма информация за резервоар</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="237"/>
+        <location filename="../core/uemis.c" line="237"/>
         <source>Low battery warning</source>
         <translation>Внимание: слаба батерия</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="239"/>
+        <location filename="../core/uemis.c" line="239"/>
         <source>Low battery alert</source>
         <translation>Тревога: слаба батерия</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="443"/>
-        <location filename="../save-html.c" line="527"/>
-        <location filename="../worldmap-save.c" line="108"/>
+        <location filename="../core/save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="553"/>
+        <location filename="../core/worldmap-save.c" line="111"/>
         <source>Can&apos;t open file %s</source>
         <translation>Не може да бъде отворен файл %s</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="462"/>
+        <location filename="../core/save-html.c" line="488"/>
         <source>Number</source>
         <translation>Номер</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="463"/>
+        <location filename="../core/save-html.c" line="489"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="464"/>
+        <location filename="../core/save-html.c" line="490"/>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="465"/>
+        <location filename="../core/save-html.c" line="491"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="466"/>
+        <location filename="../core/save-html.c" line="492"/>
         <source>Air temp.</source>
         <translation>Темп. на въздух</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="467"/>
+        <location filename="../core/save-html.c" line="493"/>
         <source>Water temp.</source>
         <translation>Темп. на водата</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="472"/>
+        <location filename="../core/save-html.c" line="498"/>
         <source>Statistics</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="476"/>
+        <location filename="../core/save-html.c" line="502"/>
         <source>Rating</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="477"/>
+        <location filename="../core/save-html.c" line="503"/>
         <source>Visibility</source>
         <translation>Видимост</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="478"/>
+        <location filename="../core/save-html.c" line="504"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="468"/>
+        <location filename="../core/save-html.c" line="494"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="469"/>
+        <location filename="../core/save-html.c" line="495"/>
         <source>Expand all</source>
         <translation>Разшири всички</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="470"/>
+        <location filename="../core/save-html.c" line="496"/>
         <source>Collapse all</source>
         <translation>Свиване на всички</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="471"/>
+        <location filename="../core/save-html.c" line="497"/>
         <source>Trips</source>
         <translation>Пътувания</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="473"/>
+        <location filename="../core/save-html.c" line="499"/>
         <source>Advanced search</source>
         <translation>Разширено търсене</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="479"/>
+        <location filename="../core/save-html.c" line="505"/>
         <source>Divemaster</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="480"/>
+        <location filename="../core/save-html.c" line="506"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="481"/>
+        <location filename="../core/save-html.c" line="507"/>
         <source>Suit</source>
         <translation>Водолазен костюм</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="482"/>
+        <location filename="../core/save-html.c" line="508"/>
         <source>Tags</source>
         <translation>Тагове</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="483"/>
+        <location filename="../core/save-html.c" line="509"/>
+        <location filename="../smtk-import/smartrak.c" line="251"/>
+        <location filename="../smtk-import/smartrak.c" line="321"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="484"/>
+        <location filename="../core/save-html.c" line="510"/>
         <source>Show more details</source>
         <translation>Покажи повече детайли</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="487"/>
+        <location filename="../core/save-html.c" line="513"/>
         <source>Yearly statistics</source>
         <translation>Годишни статистики</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="488"/>
+        <location filename="../core/save-html.c" line="514"/>
         <source>Year</source>
         <translation>Година</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="489"/>
+        <location filename="../core/save-html.c" line="515"/>
         <source>Total time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="490"/>
+        <location filename="../core/save-html.c" line="516"/>
         <source>Average time</source>
         <translation>Средно време</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="491"/>
+        <location filename="../core/save-html.c" line="517"/>
         <source>Shortest time</source>
         <translation>Най-кратко време</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="492"/>
+        <location filename="../core/save-html.c" line="518"/>
         <source>Longest time</source>
         <translation>Най-дълго време</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="493"/>
+        <location filename="../core/save-html.c" line="519"/>
         <source>Average depth</source>
         <translation>Средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="494"/>
+        <location filename="../core/save-html.c" line="520"/>
         <source>Min. depth</source>
         <translation>Мин. дълбочина</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="495"/>
+        <location filename="../core/save-html.c" line="521"/>
         <source>Max. depth</source>
         <translation>Макс. дълбочина</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="497"/>
+        <location filename="../core/save-html.c" line="523"/>
         <source>Min. SAC</source>
         <translation>Мин. SAC</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="498"/>
+        <location filename="../core/save-html.c" line="524"/>
         <source>Max. SAC</source>
         <translation>Макс. SAC</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="499"/>
+        <location filename="../core/save-html.c" line="525"/>
         <source>Average temp.</source>
         <translation>Средна темп.</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="500"/>
+        <location filename="../core/save-html.c" line="526"/>
         <source>Min. temp.</source>
         <translation>Мин. темп.</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Max. temp.</source>
         <translation>Макс. темп.</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="502"/>
+        <location filename="../core/save-html.c" line="528"/>
         <source>Back to list</source>
         <translation>Назад към списъка</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="508"/>
+        <location filename="../core/save-html.c" line="534"/>
         <source>Dive equipment</source>
         <translation>Екипировка</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="511"/>
+        <location filename="../core/save-html.c" line="537"/>
         <source>Work pressure</source>
         <translation>Работно налягане</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="512"/>
+        <location filename="../core/save-html.c" line="538"/>
         <source>Start pressure</source>
         <translation>Начално налягане</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="513"/>
+        <location filename="../core/save-html.c" line="539"/>
         <source>End pressure</source>
         <translation>Крайно налягане</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="521"/>
+        <location filename="../core/save-html.c" line="547"/>
         <source>Dive status</source>
         <translation>Статус на гмуркане</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="496"/>
+        <location filename="../core/save-html.c" line="522"/>
         <source>Average SAC</source>
         <translation>Средно SAC</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Dive No.</source>
         <translation>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="506"/>
+        <location filename="../core/save-html.c" line="532"/>
         <source>Dive profile</source>
         <translation>Гмуркачески профил</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="507"/>
+        <location filename="../core/save-html.c" line="533"/>
         <source>Dive information</source>
         <translation>Информация за гмуркане</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="509"/>
-        <location filename="../save-html.c" line="516"/>
+        <location filename="../core/save-html.c" line="535"/>
+        <location filename="../core/save-html.c" line="542"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="510"/>
+        <location filename="../core/save-html.c" line="536"/>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="514"/>
+        <location filename="../core/save-html.c" line="540"/>
         <source>Gas</source>
         <translation>Газ</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="515"/>
+        <location filename="../core/save-html.c" line="541"/>
         <source>Weight</source>
         <translation>Тежест</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="517"/>
+        <location filename="../core/save-html.c" line="543"/>
         <source>Events</source>
         <translation>Събития</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="518"/>
+        <location filename="../core/save-html.c" line="544"/>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="519"/>
+        <location filename="../core/save-html.c" line="545"/>
         <source>Value</source>
         <translation>Стойност</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="520"/>
+        <location filename="../core/save-html.c" line="546"/>
         <source>Coordinates</source>
         <translation>Координати</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="36"/>
+        <location filename="../core/worldmap-save.c" line="39"/>
         <source>Date:</source>
         <translation>Дата:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="38"/>
+        <location filename="../core/worldmap-save.c" line="41"/>
         <source>Time:</source>
         <translation>Време:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="40"/>
+        <location filename="../core/worldmap-save.c" line="43"/>
         <source>Duration:</source>
         <translation>Продължителност:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="41"/>
+        <location filename="../core/worldmap-save.c" line="44"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="43"/>
+        <location filename="../core/worldmap-save.c" line="47"/>
         <source>Max. depth:</source>
         <translation>Макс. дълбочина:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="47"/>
+        <location filename="../core/worldmap-save.c" line="50"/>
         <source>Air temp.:</source>
         <translation>Темп. на въздух:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="53"/>
         <source>Water temp.:</source>
         <translation>Темп. на водата:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="52"/>
+        <location filename="../core/worldmap-save.c" line="55"/>
         <source>Location:</source>
         <translation>Местонахождение:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="56"/>
+        <location filename="../core/worldmap-save.c" line="59"/>
         <source>Notes:</source>
         <translation>Бележки:</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="333"/>
-        <location filename="../qthelper.cpp" line="468"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="226"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="333"/>
-        <location filename="../qthelper.cpp" line="469"/>
+        <location filename="../core/qthelper.cpp" line="91"/>
+        <location filename="../core/qthelper.cpp" line="227"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="334"/>
-        <location filename="../qthelper.cpp" line="470"/>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="228"/>
         <source>E</source>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="334"/>
-        <location filename="../qthelper.cpp" line="471"/>
+        <location filename="../core/qthelper.cpp" line="92"/>
+        <location filename="../core/qthelper.cpp" line="229"/>
         <source>W</source>
         <translation>З</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="311"/>
+        <location filename="../core/git-access.c" line="341"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
         <translation>Дистанционния склад и локалните данни се разминават . Грешка: сливането се провали (%s)</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="130"/>
+        <location filename="../core/git-access.c" line="134"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
         <translation>Локалната кеш папка %s е повредена - не може да се синхронизира с облаковия склад.</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="153"/>
-        <location filename="../git-access.c" line="173"/>
+        <location filename="../core/git-access.c" line="157"/>
+        <location filename="../core/git-access.c" line="177"/>
         <source>Could not update local cache to newer remote data</source>
         <translation>Локалния кеш не може да бъде обновен.</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="166"/>
+        <location filename="../core/git-access.c" line="170"/>
         <source>Subsurface cloud storage corrupted</source>
         <translation>Облаковия слад е повреден</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="252"/>
+        <location filename="../core/git-access.c" line="285"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
         <translation>Не може да бъде обновен облаковия слад. Моля опитайте по-късно.</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="341"/>
+        <location filename="../core/git-access.c" line="371"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
         <translation>Облаковия слад и локалните данни се разминават. Данните не могат да бъдат сляти.</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="374"/>
+        <location filename="../core/git-access.c" line="405"/>
         <source>Remote storage and local data diverged</source>
         <translation>Облаковия слад и локалните данни се разминават</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="377"/>
+        <location filename="../core/git-access.c" line="408"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
         <translation>Облаковия слад и локалните данни се разминават. Грешка: записа на данни се провали (%s)</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="386"/>
+        <location filename="../core/git-access.c" line="417"/>
         <source>Problems with local cache of Subsurface cloud data</source>
         <translation>Проблем с локалния кеш на облаковия слад</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="387"/>
+        <location filename="../core/git-access.c" line="418"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
         <translation>Преместване на кеша в %s. Моля опитайте отново.</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="686"/>
+        <location filename="../core/git-access.c" line="737"/>
         <source>Error connecting to Subsurface cloud storage</source>
         <translation>Грешка при връзка с облаковия склад</translation>
     </message>
     <message>
-        <location filename="../git-access.c" line="689"/>
+        <location filename="../core/git-access.c" line="740"/>
         <source>git clone of %s failed (%s)</source>
         <translation>git clone на %s се провали (%s)</translation>
     </message>
     <message>
-        <location filename="../load-git.c" line="216"/>
-        <location filename="../parse-xml.c" line="1294"/>
+        <location filename="../core/load-git.c" line="222"/>
+        <location filename="../core/parse-xml.c" line="1300"/>
         <source>additional name for site: %s
 </source>
         <translation>допълнително име за място: %s
 </translation>
     </message>
     <message>
-        <location filename="../ostctools.c" line="120"/>
-        <location filename="../ostctools.c" line="152"/>
+        <location filename="../core/ostctools.c" line="120"/>
+        <location filename="../core/ostctools.c" line="152"/>
         <source>Unknown DC in dive %d</source>
         <translation>непознат ГК в гмуркане %d</translation>
     </message>
     <message>
-        <location filename="../ostctools.c" line="165"/>
+        <location filename="../core/ostctools.c" line="165"/>
         <source>Error - %s - parsing dive %d</source>
         <translation>Грешка - %s - резряд на гмуркане %d</translation>
     </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <source>Built</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <source>Sank</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <source>SankTime</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <source>Reason</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <source>Nationality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <source>Shipyard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <source>ShipType</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <source>Length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <source>Beam</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <source>Draught</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <source>Displacement</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <source>Cargo</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="263"/>
+        <source>Wreck Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <source>Altitude</source>
+        <translation>Височина</translation>
+    </message>
+    <message>
+        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <source>Depth</source>
+        <translation>Дълбочина</translation>
+    </message>
 </context>
 <context>
     <name>main</name>
     <message>
-        <location filename="../qt-mobile/main.qml" line="13"/>
-        <location filename="../qt-mobile/main.qml" line="110"/>
-        <source>Subsurface mobile</source>
-        <translation>Subsurface мобайл</translation>
+        <location filename="../mobile-widgets/qml/main.qml" line="13"/>
+        <source>Subsurface-mobile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+        <source>Subsurface</source>
+        <translation>Subsurface</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+        <source>Dive list</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+        <source>Cloud credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+        <source>Manage dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+        <source>Add dive manually</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+        <source>Manual sync with cloud</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <source>Offline mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+        <source>Enable auto cloud sync</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+        <source>GPS</source>
+        <translation>GPS</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+        <source>GPS-tag dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+        <source>Upload GPS data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+        <source>Download GPS data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+        <source>Show GPS fixes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+        <source>Clear GPS cache</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+        <source>Preferences</source>
+        <translation>Настройки</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+        <source>Developer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+        <source>App log</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+        <source>Theme information</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+        <source>User manual</source>
+        <translation>Ръководство за потребителя</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <source>Run location service</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+        <source>No GPS source available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+        <source>Actions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
+        <source>Hello World</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
+        <source>File</source>
+        <translation>Файл</translation>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
+        <source>Button 1 pressed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
+        <source>Button 2 pressed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
+        <source>May I have your attention, please?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>plannerDetails</name>
     <message>
-        <location filename="../qt-ui/plannerDetails.ui" line="14"/>
+        <location filename="../desktop-widgets/plannerDetails.ui" line="14"/>
         <location filename="../build/ui_plannerDetails.h" line="90"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerDetails.ui" line="43"/>
+        <location filename="../desktop-widgets/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>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Детайли за гмуркачески план&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerDetails.ui" line="59"/>
+        <location filename="../desktop-widgets/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="../desktop-widgets/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;
@@ -9496,35 +10946,35 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>plannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="14"/>
         <location filename="../build/ui_plannerSettings.h" line="420"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="74"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="74"/>
         <location filename="../build/ui_plannerSettings.h" line="421"/>
         <source>Rates</source>
         <translation>Рейтинг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="95"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="95"/>
         <location filename="../build/ui_plannerSettings.h" line="422"/>
         <source>Ascent</source>
         <translation>Изкачване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="104"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="104"/>
         <location filename="../build/ui_plannerSettings.h" line="423"/>
         <source>below 75% avg. depth</source>
         <translation>Под 75% средна дълбочина</translation>
     </message>
     <message>
-        <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="../desktop-widgets/plannerSettings.ui" line="111"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="128"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="145"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="162"/>
+        <location filename="../desktop-widgets/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"/>
@@ -9534,150 +10984,150 @@ p, li { white-space: pre-wrap; }
         <translation>м/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="175"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
         <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
         <translation>Спускане</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="187"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="187"/>
         <location filename="../build/ui_plannerSettings.h" line="433"/>
         <source>surface to the bottom</source>
         <translation>Повърхност до дъно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="240"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="240"/>
         <location filename="../build/ui_plannerSettings.h" line="434"/>
         <source>Planning</source>
         <translation>Планиране</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="261"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="261"/>
         <source>VPM-B deco</source>
         <translation>VPM-B деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="278"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <location filename="../build/ui_plannerSettings.h" line="445"/>
         <source>Reserve gas</source>
         <translation>Обратен газ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="320"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <location filename="../build/ui_plannerSettings.h" line="449"/>
         <source>Postpone gas change if a stop is not required</source>
         <translation>Отмени смяна на газ ако стоп не е нужен</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="323"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="323"/>
         <location filename="../build/ui_plannerSettings.h" line="451"/>
         <source>Only switch at required stops</source>
         <translation>Превключи само в нужните стопове</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="343"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="343"/>
         <location filename="../build/ui_plannerSettings.h" line="442"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="307"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="416"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
         <location filename="../build/ui_plannerSettings.h" line="437"/>
         <location filename="../build/ui_plannerSettings.h" line="440"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
         <location filename="../build/ui_plannerSettings.h" line="435"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="429"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
         <location filename="../build/ui_plannerSettings.h" line="441"/>
         <source>Drop to first depth</source>
         <translation>Спускане до първа дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
         <location filename="../build/ui_plannerSettings.h" line="438"/>
         <source>Last stop at 6m</source>
         <translation>Последен стоп на 6 метра</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="353"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
         <location filename="../build/ui_plannerSettings.h" line="436"/>
         <source>Plan backgas breaks</source>
         <translation>Планирай &quot;бекгас брейкс&quot;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
         <location filename="../build/ui_plannerSettings.h" line="455"/>
         <source>Gas options</source>
         <translation>Газ настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="594"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
         <location filename="../build/ui_plannerSettings.h" line="456"/>
         <source>Bottom SAC</source>
         <translation>Долен SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="692"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
         <location filename="../build/ui_plannerSettings.h" line="457"/>
         <source>Deco SAC</source>
         <translation>Деко SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="601"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
         <location filename="../build/ui_plannerSettings.h" line="458"/>
         <source>Bottom pO₂</source>
         <translation>Долен pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="685"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
         <location filename="../build/ui_plannerSettings.h" line="460"/>
         <source>Deco pO₂</source>
         <translation>Деко pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="565"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="672"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
         <location filename="../build/ui_plannerSettings.h" line="462"/>
         <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>л/мин.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="632"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
         <location filename="../build/ui_plannerSettings.h" line="468"/>
         <source>Display runtime</source>
         <translation>Покажи времетраене</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="645"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
         <location filename="../build/ui_plannerSettings.h" line="472"/>
         <source>Display segment duration</source>
         <translation>Покажи времетраене на сегментацията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="655"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <location filename="../build/ui_plannerSettings.h" line="476"/>
         <source>Display transitions in deco</source>
         <translation>Покажи транзиции в декомпресията</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="662"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
         <location filename="../build/ui_plannerSettings.h" line="477"/>
         <source>Verbatim dive plan</source>
         <translation>Дословен гмуркачески план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="549"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="578"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
         <location filename="../build/ui_plannerSettings.h" line="446"/>
         <location filename="../build/ui_plannerSettings.h" line="459"/>
         <location filename="../build/ui_plannerSettings.h" line="461"/>
@@ -9685,82 +11135,82 @@ p, li { white-space: pre-wrap; }
         <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="121"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
         <location filename="../build/ui_plannerSettings.h" line="425"/>
         <source>75% to 50% avg. depth</source>
         <translation>75% до 50% средна дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="138"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
         <location filename="../build/ui_plannerSettings.h" line="427"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% средна дълбочина до 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="155"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
         <location filename="../build/ui_plannerSettings.h" line="429"/>
         <source>6m to surface</source>
         <translation>6м до повърхността</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
         <source>Bühlmann deco</source>
         <translation>Bühlmann деко</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
         <location filename="../build/ui_plannerSettings.h" line="453"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="396"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
         <source>Maximize bottom time allowed by gas and no decompression limits</source>
         <translation>Увеличи долното време позволено от газ и не от границите на декомпресия.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="399"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
         <location filename="../build/ui_plannerSettings.h" line="443"/>
         <source>Recreational mode</source>
         <translation>Режим за развлечение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="436"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
         <location filename="../build/ui_plannerSettings.h" line="452"/>
         <source>Min. switch duration</source>
         <translation>Мин. дължина на превключване</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="459"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
         <location filename="../build/ui_plannerSettings.h" line="444"/>
         <source>Safety stop</source>
         <translation>Безопасен стоп</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="495"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
         <source>Conservatism level</source>
         <translation>Ниво на консерватизъм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="608"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
         <location filename="../build/ui_plannerSettings.h" line="464"/>
         <source>Notes</source>
         <translation>Бележки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="629"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
         <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Покажи времетраене (абсолютно време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="642"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
         <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Покажи времетраене (oтносително време) на стоповете в гмуркаческия план</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="652"/>
+        <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
         <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Покажи преводи или ги третирай като косвени в гмуркаческия план</translation>