1 files changed, 3429 insertions, 1979 deletions

diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 06456d96b..3ce84c48d 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -1,256 +1,284 @@
 <?xml version="1.0" ?><!DOCTYPE TS><TS language="he" 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>מנסה להדליק מכשיר 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>מנסה לכבות מכשיר 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>נותק</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>חובר</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>מורשה_חובר</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. ניתן ללחוץ &quot;שמור&quot;.</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>צלילה מס&apos; </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>טמפ&apos; האוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
         <source>Water temp.</source>
         <translation>טמפ&apos; המים</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>חמצן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>He</source>
         <translation>הליום</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>טמפ&apos; דגימה</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 של דגימה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
+        <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Sample TTS</source>
         <translation>זמן לפני המים של הדגימה</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>דגימה pO₂ של חיישן 1</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>דגימה pO₂ של חיישן 2</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>דגימה pO₂ של חיישן 3</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>מס&apos; סידורי</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>מעגל פתוח</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>מעגל סגור</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>MMDDYY</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>DDMMYY</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>YYMMDD</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>מטר למעלות צלזיוס</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>רגל למעלות פרנהייט</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>סנכרון זמן מחשב צלילת עם מחשב</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 ל-גאוס</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 ל-גאוס</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 ל-גאוס</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 ל-גאוס</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 ל-גאוס</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 ל-גאוס</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 ל-גאוס</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 ל-גאוס</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>ניתן לבחור גרדיאנט חילופי מתחת לפני למים</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</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>זמן לפני המים עתידי</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>גרדיאנט תחתון</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>גרדיאנט עליון</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>שמור קובץ log של 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>גרדיאנט תחתון חילופי</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>גרדיאנט עליון חילופי</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>% הליום</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>גז ממהל 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>גז ממהל 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>גז ממהל 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>גז ממהל 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>שינוי עומק [m]</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>נקודה קבוע 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>נקודה קבוע 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>נקודה קבוע 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>נקודה קבוע 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>נקודה קבוע 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>cbar</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>סה&quot;כ זמן צלילה</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>אזהרת עומק מקסימלי</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>אחוז חמצן</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>חמצן בגז כיול</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>MM/DD/YY</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>DD/MM/YY</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>YY/MM/DD</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 מערכת סגורה</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 - גרדיאנט - מערכת פתוחה</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 - גרדיאנט - מערכת סגורה</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>מערכת חצי סגורה - גרדיאנט</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>בחור קובץ לקובץ log להורדה של libdivecomputer</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>% הליום</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>אחוז חמצן</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>להשתמש</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="132"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="44"/>
+        <source>cuft</source>
+        <translation>cuft</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,18 +1916,18 @@
 <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>
@@ -1850,20 +1957,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 type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+        <source>Water Temp:</source>
+        <translation type="unfinished"/>
+    </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 type="unfinished"/>
+    </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 type="unfinished"/>
+    </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>צריכת אויר:</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>מעבר ידני למערכת פתוחה</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>
@@ -1872,125 +2159,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>
@@ -1998,12 +2315,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>
@@ -2011,330 +2328,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>עומק של תמונות</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>XML של Subsurface</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>divelogs.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>פורמט XML של Subsurface.</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>היצוא קובץ CSV כ-</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>היצוא XML של Subsurface</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  נתמכים (*.ssrf *.xml)</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>
@@ -2342,345 +2659,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>dd.mm.yyyy</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>mm/dd/yyyy</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>yyyy-mm-dd</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>צלילה מס&apos; </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>חמצן</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>הליום</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>Tab</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>טמפ&apos; דגימה</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>דגימה pO₂ של חיישן 1</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>דגימה pO₂ של חיישן 2</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>דגימה pO₂ של חיישן 3</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 של דגימה</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>זמן לפני המים של הדגימה</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>טמפ&apos; האוויר</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>טמפ&apos; המים</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>
@@ -2694,27 +3022,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>זמן צלילה</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>נקודה קבוע למערכת סגורה</translation>
     </message>
@@ -2722,22 +3050,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>
@@ -2745,112 +3073,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>לחץ הליום</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>צריכת אויר</translation>
     </message>
@@ -2858,55 +3186,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>זיהוי משתמש</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>הזן זיהוי משתמש</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; אם אינך משתמש בזיהוי משתמש אז יהיה צריך לזכור את הסימניות לצלילות על מנת למצוא אותם שוב.&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;, ותהיה נגיש רק אם כתובת האתר שלהם ידועה.</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>stylesheet לייצא ל-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>בחור קובץ לקובץ log להורדה של libdivecomputer</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>שמירת dump של 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>בחר קובץ לקובץ dump של divecomputer</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>קבצי Dump (*.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>שמור קובץ log של 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>שמור קובץ dump של 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>להתחבר לפייסבוק מציין מיקום טקסט </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 מהחשבון שלך בפייסבוק, להשתמש בלחצן למטה</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>כדי להתחבר לפייסבוק, אנא התחבר. זה מאפשר 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>תיבת קבוצה</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>אתרי צלילה באותה נ&quot;צ</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>טמפ&apos; האוויר</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>טמפ&apos; המים</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>סה&quot;כ זמן</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>צריכת אויר</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>מעגל פתוח</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>CCR</source>
         <translation>מערכת סגורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="98"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>pSCR</source>
         <translation>מערכת חצי סגורה</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>טמפ&apos; האוויר [%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>טמפ&apos; המים [%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>צריכת גז מירבי בצלילה</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>צריכת גז מינימלי בצלילה</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>צריכת גז ממוצע בצלילות הנבחרות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="666"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="668"/>
         <source>Highest temperature</source>
         <translation>טמפ&apos; מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="667"/>
+        <location filename="../desktop-widgets/maintab.cpp" line="669"/>
         <source>Lowest temperature</source>
         <translation>טמפ&apos; נמוכה ביותר</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>טמפ&apos; ממוצה לצלילות הנבחרות ביותר</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,813 +4523,853 @@ 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>הצג/הסתר גרף pHe</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, זמן לפני המים</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>הפעיל/כבה תקרה מחושבת עם מרווחי</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>הגדרות מחשב צלילה</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>הצג/הסתר עומק מירבי</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>צריכת אויר</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>תצוגה</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>ערוך</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>שמור בשם</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>הגדרות</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>היבוא נתוני 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>ערוך שמות של מכשירים</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>העתקה רכיבי צלילת</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>הדבק רכיבי צלילה</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>פרופיל</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>פרטים</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>כולם</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>מחשב צלילה הבא</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>אודות 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>גלובוס</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>יבוא מ- 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>מסך מלא</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>בדוק לעדקונים</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>יצוא</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>הצג/הסתר גרף pO₂</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>סנן רשימת צלילות</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>סקר משתמשים</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>לבטל שינוי</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>בצע שינוי שוב</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>חפש תמונות שזזו</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>פתח אחסון בענן</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>שמור לאחסון בענן</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>ניהול אתרי צלילה</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>ערוך אתר צלילה</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>יבוא ממחשב צלילה</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>קבץ אוטומטי</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>סטטיסטיקה שנתית</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>רשימת צלילות</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>מחשב צלילה קודם</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>מדריך משתמש</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>תכנן צלילה</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>יבוא קובץ יומן צלילה</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 files (*.csv *.CSV);;קבצי DiveLog.de (*.dld *.DLD);;קבצי JDiveLog (*.jlb *.JLB);;קבצי Liquivision (*.lvd *.LVD);;קבצי MkVI (*.txt *.TXT);;קבצי Suunto (*.sde *.db *.SDE *.DB);;קבצי Divesoft (*.dlf *.DLF);;קבצי UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;קבצי XML (*.xml *.XML);;קבצי APD (*.apd *.APD);;קבצי Datatrak/WLog (*.log *.LOG);;קבצי OSTCtools (*.dive *.DIVE);;כל קבצים (*)</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>קבצי 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>
@@ -4848,7 +5387,7 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל יכ
 <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>
@@ -4856,12 +5395,12 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל יכ
 <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>
@@ -4870,27 +5409,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 אנא להתחיל Bluetooth ב-OSTC הספורט שלך ולעשות את אותו הדבר בהכנות כלהורדת יומן לפני שתמשיך בעדכון</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>
@@ -4898,218 +5437,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>מערכת סגורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="323"/>
+        <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
         <source>pSCR</source>
         <translation>מערכת חצי סגורה</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 מ&apos;</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>bar</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>קובץ ברירות מחדל מקומי</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
+        <source>Clo&amp;ud storage default file</source>
+        <translation>קובץ ברירת מחדל לאחסון בענן</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>קבצי 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>קובץ ברירות מחדל מקומי</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>קובץ ברירת מחדל לאחסון בענן</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>להתחבר לפייסבוק מציין מיקום טקסט </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>
@@ -5130,174 +5789,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>bar</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>רגל מ&quot;ק</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>מערכת סגורה: הצג נקודות קבועות כשמוצג 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>מערכת סגורה: הצג חיישני 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>נקודה קבוע ברירת מחדל לתכנון צלילות למערכת סגורה</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>קצב חילוף חומרים של 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>יחס מערכת חצי סגורה</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>
@@ -5309,362 +5937,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>אימות מספר זיהוי אישי</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>זיהוי משתמש ברירות מחדל</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>שמור זיהוי משתמש מקומי</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>lbs</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>גרדיאנט תחתון בעומק מירבי</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>מידה</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>התאמה אישית</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>ליטר</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>נ&quot;צ</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>מסורתיות (מעלות דקות שניות)</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>גרדיאנט תחתון</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="906"/>
         <location filename="../build/ui_preferences.h" line="1361"/>
         <source>GFHigh</source>
         <translation>גרדיאנט עליון</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>bar</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
+        <source>Default CCR set-point for dive planning</source>
+        <translation>נקודה קבוע ברירת מחדל לתכנון צלילות למערכת סגורה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
+        <source>pSCR O₂ metabolism rate</source>
+        <translation>קצב חילוף חומרים של O₂ למערכת חצי סגורה</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+        <source>GFLow</source>
+        <translation>גרדיאנט תחתון</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
+        <source>GFHigh</source>
+        <translation>גרדיאנט עליון</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>יחס מערכת חצי סגורה</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>מערכת סגורה: הצג חיישני O₂ נפרדים כשמוצג pO₂</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
+        <source>CCR: show setpoints when viewing pO₂</source>
+        <translation>מערכת סגורה: הצג נקודות קבועות כשמוצג 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>גרדיאנט תחתון בעומק מירבי</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>אימות מספר זיהוי אישי</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>זיהוי משתמש ברירות מחדל</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_network.ui" line="260"/>
+        <source>Save user ID locally?</source>
+        <translation>שמור זיהוי משתמש מקומי</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 מהחשבון שלך בפייסבוק, להשתמש בלחצן למטה</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>כדי להתחבר לפייסבוק, אנא התחבר. זה מאפשר 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>אם תלחץ על אישור, כל ההגדרות של Subsurface תהיה מאופסים לערכי ברירת המחדל שלהם. זו תיושם באופן מיידי.</translation>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="33"/>
+        <source>&amp;Metric</source>
+        <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="478"/>
-        <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>קבצי 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>התאמה אישית</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>bar</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>ליטר</translation>
+    </message>
+    <message>
+        <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/>
+        <source>cu ft</source>
+        <translation>רגל מ&quot;ק</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>נ&quot;צ</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>מסורתיות (מעלות דקות שניות)</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>
@@ -5687,406 +6709,456 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
         <translation>2 צלילות לעמוד</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>הדפס רשימת צלילות</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>הדפס סטטיסטיקות</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>צריכת אויר:</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>הוסיף שינוי נקודה קבוע</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>bar</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>l</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="1395"/>
+        <location filename="../core/qthelper.cpp" line="1299"/>
         <source>cuft</source>
         <translation>cuft</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;, נמצא %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>
@@ -6094,20 +7166,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>
@@ -6115,7 +7187,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>
@@ -6123,7 +7195,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>
@@ -6132,19 +7204,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>נקודה קבוע חדשה (0 למערכת פתוחה)</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>bar</translation>
@@ -6153,37 +7225,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>h:mm</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
@@ -6193,41 +7265,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>
@@ -6235,51 +7307,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>h:mm</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>
@@ -6319,56 +7391,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>
@@ -6378,154 +7514,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>תצוגה מקדימה פייסבוק</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;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, ועוד, 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>הזן את זיהוי משתמש ולחץ על הורדה</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>
@@ -6533,7 +7679,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>
@@ -6541,7 +7687,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>
@@ -6549,8 +7695,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>
@@ -6560,7 +7706,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>
@@ -6568,7 +7714,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>
@@ -6576,17 +7722,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>מ&quot;ל</translation>
     </message>
     <message>
-        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="90"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -6594,167 +7740,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>שקדים</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>גוונים של כחול</translation>
     </message>
     <message>
-        <location filename="../qt-ui/templateedit.ui" line="188"/>
+        <location filename="../desktop-widgets/templateedit.ui" line="188"/>
         <source>Custom</source>
         <translation>חופשי</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>צבע 1</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>צבע 2</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>צבע 3</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>צבע 4</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>צבע 5</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>צבע 6</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>
@@ -6823,19 +7969,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>TopBar</name>
+    <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="../qt-mobile/TopBar.qml" line="59"/>
-        <source>Subsurface mobile</source>
-        <translation>Subsurface mobile</translation>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
+        <source>Geometry (pixels):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
+        <source>Geometry (gridUnits):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
+        <source>Units.gridUnit:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
+        <source>Units.devicePixelRatio:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
+        <source>Font Metrics</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
+        <source>FontMetrics pointSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
+        <source>FontMetrics pixelSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
+        <source>FontMetrics devicePixelRatio:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
+        <source>Text item pixelSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
+        <source>Text item pointSize:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
+        <source>Pixel density:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
+        <source>Height of default font:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ToolTipItem</name>
+    <message>
+        <location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
+        <source>Information</source>
+        <translation>מידע נוסף</translation>
     </message>
 </context>
 <context>
@@ -6944,13 +8163,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>
@@ -6959,72 +8178,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>אתה משתמש בגרסה האחרונה של 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>גרסה חדשה של Subsurface זמינה.&lt;br/&gt;לחץ כאן:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; כדי להוריד.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="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 בודקת כל שבועיים אם גרסה חדשה זמינה. אם אתה לא רוצה Subsurface להמשיך לבדוק, אנא לחץ על דחה.</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>
@@ -7032,13 +8251,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>קובץ המדריך למשתמש לא נמצא</translation>
     </message>
@@ -7046,169 +8265,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>אפליקציה נלווית אנדרואיד / 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>
 ארכיטקטורת מעבד: %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>
 ארכיטקטורת מעבד מערכת הפעלה: %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>
@@ -7216,12 +8435,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>
@@ -7229,60 +8448,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>הכנס זיהוי כאן</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>זיהוי משתמש</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>שמור זיהוי משתמש מקומי</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>
@@ -7308,8 +8527,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>
@@ -7317,15 +8536,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>
@@ -7415,37 +8634,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>
@@ -7453,7 +8672,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>שגיאת בניתוח הכותרת</translation>
     </message>
@@ -7461,656 +8680,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>bar</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>cuft</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>lbs</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; אנא השתמש בדאילוג יבוא קובץ יומן צלילה</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>יבוא פוסידון נכשל: לא הצליח לקרוא &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>מצב פיה  - מערכת פתוחה</translation>
     </message>
     <message>
-        <location filename="../file.c" line="678"/>
+        <location filename="../core/file.c" line="734"/>
         <source>Mouth piece position CC</source>
         <translation>מצב פיה  - מערכת סגורה</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>כיול חמצן נכשל</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>כיול חמצן</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>זמן נותר בעומק</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>עומק מקס&apos;</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>מס&apos; ארוע שגוי</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>שגיאה בקריאת זמן צלילה</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="529"/>
+        <location filename="../core/libdivecomputer.c" line="529"/>
         <source>Error parsing the maxdepth</source>
         <translation>שגיאה בקריאת עומק מקסימלי</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="548"/>
+        <location filename="../core/libdivecomputer.c" line="548"/>
         <source>Error parsing temperature</source>
         <translation>שגיאה בקריאת טמפרטורה</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>שגיאה בקריאת תערובת גזים</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>שגיאה בקריאת תערובת הגזים</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="684"/>
+        <location filename="../core/libdivecomputer.c" line="684"/>
         <source>Error parsing the samples</source>
         <translation>שגיאה בקריאת נקודות דגימה</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>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%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>לא ניתן לפתוח את %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>צריכת דלק (לא כולל זמן במערכת סגורה):</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 עם גרדיאנט תחתון=%d וגרדיאנט עליון =%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 עם גרדיאנט תחתון=%d וגרדיאנט עליון =%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>
@@ -8119,70 +9343,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>צריכת גז: %.*f%s/min
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1151"/>
+        <location filename="../core/profile.c" line="1298"/>
         <source>CNS: %u%%
 </source>
         <translation>רעילות שייורית מקסימלית %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>
@@ -8191,7 +9415,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>
@@ -8200,634 +9424,634 @@ 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
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1192"/>
+        <location filename="../core/profile.c" line="1339"/>
         <source>Deco: %umin @ %.0f%s
 </source>
         <translation>דקו: %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>דקו: זמן לא ידוע @ %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../core/profile.c" line="1346"/>
         <source>In deco
 </source>
         <translation>בדקו
 </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>דקו: %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>בדקו (חישוב)
 </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; שעתיים (מחושב)
 </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; שעתיים (מחושב)
 </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 min</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 ק&quot;מ</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="311"/>
+        <location filename="../core/qthelper.cpp" line="69"/>
         <source>%1m</source>
         <translation>%1 מ&apos;</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="315"/>
+        <location filename="../core/qthelper.cpp" line="73"/>
         <source>%1mi</source>
         <translation>%1 מייל</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="317"/>
+        <location filename="../core/qthelper.cpp" line="75"/>
         <source>%1yd</source>
         <translation>%1 יארד</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>fresh</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>הערות מ-</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>גז למערכת פתוחה</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>%dd %dh %dmin</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>%dh %dmin</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>
 ולחץ על &apos;נסה שנית&apos;</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>
 ולחץ על &apos;נסה שנית&apos;</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>יומן צלילה #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="494"/>
+        <location filename="../core/uemis-downloader.c" line="497"/>
         <source>divespot #</source>
         <translation>אתר צלילה #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="496"/>
+        <location filename="../core/uemis-downloader.c" line="499"/>
         <source>details for #</source>
         <translation>פרטים ל-#</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>ז&apos;קט</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>אזהרת RGT</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="221"/>
+        <location filename="../core/uemis.c" line="221"/>
         <source>RGT alert</source>
         <translation>התראת RGT</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>טמפ&apos; האוויר</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="467"/>
+        <location filename="../core/save-html.c" line="493"/>
         <source>Water temp.</source>
         <translation>טמפ&apos; המים</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>סה&quot;כ זמן</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>צריכת גז מינימלי</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="498"/>
+        <location filename="../core/save-html.c" line="524"/>
         <source>Max. SAC</source>
         <translation>צריכת גז מירבי</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>טמפ&apos; מינימלי</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="501"/>
+        <location filename="../core/save-html.c" line="527"/>
         <source>Max. temp.</source>
         <translation>טמפ&apos; מקסימלי</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>צריכת גז ממוצע</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="505"/>
+        <location filename="../core/save-html.c" line="531"/>
         <source>Dive No.</source>
         <translation>צלילה מס&apos; </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>טמפ&apos; האוויר:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="50"/>
+        <location filename="../core/worldmap-save.c" line="53"/>
         <source>Water temp.:</source>
         <translation>טמפ&apos; מים:</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>אחסון בענן של Subsurface פגומה</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>לא ניתן לעדכן אחסון ענן של Subsurface, נסה שוב מאוחר יותר</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>בעיות עם מטמון מקומי של נתוני ענן Subsurface</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>שגיאה בחיבור לאחסון בענן של Subsurface</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 של%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 mobile</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 type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
+        <source>&amp;Open</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
+        <source>Button 1 pressed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
+        <source>Button 2 pressed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
+        <source>May I have your attention, please?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>plannerDetails</name>
     <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>גרדיאנט תחתון</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>גרדיאנט עליון</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 מ&apos;</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>תכנן הפסקות גזים</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>צריכת גז בעומק מירבי</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>צריכת גז בדקו</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>bar</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>דקו ע&quot;י אלגוריטם של 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>בתכנית צלילה, להראות משך (זמן יחסי) של תחנות</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>