Translation updates

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

1 files changed, 3871 insertions, 1705 deletions

diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index ddabd7e8d..901156d2e 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -1,14 +1,269 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
-<defaultcodec>UTF-8</defaultcodec>
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.1">
+<context>
+    <name>BtDeviceSelectionDialog</name>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="14"/>
+        <source>Remote Bluetooth device selection</source>
+        <translation>Wybór zdalnego urządzenia Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="32"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="28"/>
+        <source>Discovered devices</source>
+        <translation>Wykryte urządzenia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="41"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="31"/>
+        <source>Save</source>
+        <translation>Zapisz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="54"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="32"/>
+        <source>Quit</source>
+        <translation>Wyjście</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="83"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="29"/>
+        <source>Scan</source>
+        <translation>Skanuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="96"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="30"/>
+        <source>Clear</source>
+        <translation>Wyczyść</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="119"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="22"/>
+        <source>Local Bluetooth device details</source>
+        <translation>Szczegóły lokalnego urządzenia Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="128"/>
+        <source>Name: </source>
+        <translation>Nazwa:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="142"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="24"/>
+        <source>Address:</source>
+        <translation>Adres:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="171"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="26"/>
+        <source>Bluetooth powered on</source>
+        <translation>Bluetooth włączony</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="193"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="27"/>
+        <source>Turn on/off</source>
+        <translation>Włącz/Wyłącz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.ui" line="203"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="23"/>
+        <source>Select device:</source>
+        <translation>Wybierz urządzenie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="25"/>
+        <source>Name:</source>
+        <translation>Nazwa:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="128"/>
+        <source>Trying to turn on the local Bluetooth device...</source>
+        <translation>Próbuję włączyć lokalne urzadzenie Bluetooth...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="131"/>
+        <source>Trying to turn off the local Bluetooth device...</source>
+        <translation>Próbuję wyłączyć lokalne urządzenie Bluetooth</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="177"/>
+        <source>Scanning for remote devices...</source>
+        <translation>Trwa skanowanie w poszukiwaniu zdalnych urządzeń...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="186"/>
+        <source>Scanning finished successfully.</source>
+        <translation>Skanowanie zakończone pomyślnie.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="219"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="333"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="353"/>
+        <source>UNPAIRED</source>
+        <translation>NIESPAROWANE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="223"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="338"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="351"/>
+        <source>PAIRED</source>
+        <translation>SPAROWANE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="226"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="343"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="352"/>
+        <source>AUTHORIZED_PAIRED</source>
+        <translation>SPAROWANE I ZAUTORYZOWANE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="230"/>
+        <source>%1 (%2)   [State: %3]</source>
+        <translation>%1 (%2)   [Stan: %3]</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="247"/>
+        <source>The device %1 can be used for connection. You can press the Save button.</source>
+        <translation>Urządzenie %1 może zostać użyte. Możesz wcisnąć przycisk Zapisz.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="256"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="369"/>
+        <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
+        <translation>Urządzenie %1 musi zostać sparowane przed użyciem. Użyj menu kontekstowego. </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="280"/>
+        <source>The local device was changed.</source>
+        <translation>Lokalne urządzenie zostało zmienione.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="300"/>
+        <source>Pair</source>
+        <translation>Połącz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="50"/>
+        <source>Could not initialize Winsock version 2.2</source>
+        <translation>NIe udało się zinicjalizować Winsock wersja 2.2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="161"/>
+        <source>Remote devices list was cleared.</source>
+        <translation>Wyczyszczono listę zdalnych urzadzeń.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="202"/>
+        <source>The local Bluetooth device was %1.</source>
+        <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+        <translation>Lokalne urządzenie Bluetooth zostało %1.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/>
+        <source>turned on</source>
+        <translation>włączone</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="203"/>
+        <source>turned off</source>
+        <translation>wyłączone</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="301"/>
+        <source>Remove pairing</source>
+        <translation>Rozłącz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="317"/>
+        <source>Trying to pair device %1</source>
+        <translation>Próbuję sparować urządzenie %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="321"/>
+        <source>Trying to unpair device %1</source>
+        <translation>Próbuję rozłączyć urządzenie %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="334"/>
+        <source>Device %1 was unpaired.</source>
+        <translation>Urządzenie %1 zostało odłączone.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="341"/>
+        <source>Device %1 was paired.</source>
+        <translation>Urządzenie %1 zostało sparowane.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="346"/>
+        <source>Device %1 was authorized paired.</source>
+        <translation>Urządzenie %1 zostało sparowane i zautoryzowane.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="372"/>
+        <source>The device %1 can now be used for connection. You can press the Save button.</source>
+        <translation>Urządzenie %1 może zostać użyte do połączenia. Możesz wcisnać przycisk Zapisz.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="384"/>
+        <source>Local device error: %1.</source>
+        <translation>Błąd lokalnego urządzenia: %1.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="385"/>
+        <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="387"/>
+        <source>Unknown error</source>
+        <translation>Nieznany błąd.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="396"/>
+        <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="399"/>
+        <source>Writing to or reading from the device resulted in an error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="405"/>
+        <source>An unknown error has occurred.</source>
+        <translation>Natrafiono na nieznany błąd.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="410"/>
+        <source>Device discovery error: %1.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="438"/>
+        <source>Not available</source>
+        <translation>Niedostępne</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="445"/>
+        <source>The local Bluetooth adapter cannot be accessed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="495"/>
+        <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
 <context>
     <name>BuddyFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="522"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="595"/>
         <source>Person: </source>
         <translation>Osoba:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="523"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="596"/>
         <source>Searches for buddies and divemasters</source>
         <translation>Wyszukiwanie partnerów i divemasterów</translation>
     </message>
@@ -16,7 +271,7 @@
 <context>
     <name>BuddyFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="230"/>
+        <location filename="../qt-models/filtermodels.cpp" line="233"/>
         <source>No buddies</source>
         <translation>brak partnerów</translation>
     </message>
@@ -24,180 +279,205 @@
 <context>
     <name>ColumnNameProvider</name>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Dive #</source>
         <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Cyl. size</source>
         <translation>Rozmiar butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="25"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="37"/>
         <source>Start pressure</source>
         <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>End pressure</source>
         <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Air temp.</source>
         <translation>Temp. powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Water temp.</source>
         <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Max. depth</source>
         <translation>Maks. głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="26"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
         <source>Avg. depth</source>
         <translation>Śr. głębokość </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="38"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample time</source>
         <translation>Czas próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample depth</source>
         <translation>Głębokość próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample temperature</source>
         <translation>Temperatura próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample pO₂</source>
         <translation>pO₂ próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample CNS</source>
         <translation>CNS próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="27"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="39"/>
         <source>Sample NDL</source>
         <translation>NDL próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample TTS</source>
         <translation>TTS próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample stopdepth</source>
         <translation>Przystanek próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="28"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="40"/>
         <source>Sample pressure</source>
         <translation>Ciśnienie próbki</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="41"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="42"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>ConfigureDiveComputer</name>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="212"/>
+        <location filename="../configuredivecomputer.cpp" line="220"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
         <translation>Nie można zapisać kopii pliku %1. Komunikat błędu: %2</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="228"/>
+        <location filename="../configuredivecomputer.cpp" line="236"/>
         <source>Could not open backup file: %1</source>
         <translation>Nie można otworzyć kopii zapasowej pliku : %1</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="552"/>
+        <location filename="../configuredivecomputer.cpp" line="584"/>
         <source>Dive computer details read successfully</source>
         <translation>Konfiguracja komputera odczytana poprawnie</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="561"/>
+        <location filename="../configuredivecomputer.cpp" line="593"/>
         <source>Setting successfully written to device</source>
         <translation>Pomyślnie zapisano ustawienia w urządzeniu</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="570"/>
+        <location filename="../configuredivecomputer.cpp" line="602"/>
         <source>Device firmware successfully updated</source>
         <translation>Oprogramowanie urządzenia pomyślnie zaktualizowane</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputer.cpp" line="579"/>
+        <location filename="../configuredivecomputer.cpp" line="611"/>
         <source>Device settings successfully reset</source>
         <translation>Ustawienie urządzenia pomyślnie zresetowane </translation>
     </message>
@@ -206,924 +486,1214 @@
     <name>ConfigureDiveComputerDialog</name>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1518"/>
         <source>Configure dive computer</source>
         <translation>Konfiguracja komputera nurkowego </translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1519"/>
         <source>Device or mount point</source>
         <translation>Urządzenie lub punkt montowania</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="41"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="141"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1521"/>
         <source>Retrieve available details</source>
         <translation>Pobierz ustawienia</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
         <source>Save changes to device</source>
         <translation>Zapisz zmiany do urządzenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
         <source>Backup</source>
         <translation>Kopia</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1530"/>
         <source>Restore backup</source>
         <translation>Przywróć z kopii</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1531"/>
         <source>Update firmware</source>
         <translation>Aktualizacja oprogramowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="148"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="171"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="185"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
         <source>OSTC 3</source>
         <translation>OSTC 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="210"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1242"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="224"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1376"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1752"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1616"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1764"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1781"/>
         <source>Basic settings</source>
         <translation>Podstawowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="216"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="268"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1471"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1768"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
         <source>Serial No.</source>
         <translation>Nr seryjny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="239"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1360"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="291"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1494"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1791"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
         <source>Firmware version</source>
         <translation>Wersja oprogramowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="256"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1394"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="308"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1528"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1808"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
         <source>Custom text</source>
         <translation>Własny tekst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="331"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="290"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="231"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1552"/>
         <source>English</source>
         <translation>Angielski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="236"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1553"/>
         <source>German</source>
         <translation>Niemiecki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="241"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1554"/>
         <source>French</source>
         <translation>Francuski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="246"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1555"/>
         <source>Italian</source>
         <translation>Włoski</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="365"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
         <source>Dive mode</source>
         <translation>Tryb pracy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="324"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="342"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
         <source>OC</source>
         <translation>OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="329"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
         <source>CC</source>
         <translation>CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="334"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1930"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="352"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2035"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
         <source>Gauge</source>
         <translation>Gauge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="339"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="357"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
         <source>Apnea</source>
         <translation>Apnea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1802"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="394"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1936"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
         <source>Date format</source>
         <translation>Format daty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1568"/>
         <source>MMDDYY</source>
         <translation>MMDDYY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="363"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="381"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1569"/>
         <source>DDMMYY</source>
         <translation>DDMMYY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="368"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="386"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1570"/>
         <source>YYMMDD</source>
         <translation>YYMMDD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="841"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2022"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="883"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2156"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
         <source>Saturation</source>
         <translation>Nasycanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="662"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="688"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="740"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="806"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="825"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1131"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1843"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1905"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1973"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1999"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2032"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2048"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="453"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="667"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="690"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="716"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="768"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="834"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="860"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="942"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="958"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1265"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1977"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2081"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2107"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2133"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2173"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2196"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="678"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1833"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="706"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1960"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
         <source>Desaturation</source>
         <translation>Odsycanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="796"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="824"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2097"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
         <source>Last deco</source>
         <translation>Ostatni przystanek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1872"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="745"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2006"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
         <source> m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="423"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
         <source>Brightness</source>
         <translation>Jasność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="387"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
         <source>Eco</source>
         <translation>Eco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="392"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="410"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
         <source>Medium</source>
         <translation>Średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="397"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="415"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
         <source>High</source>
         <translation>Wysoka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="522"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1792"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="540"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1926"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
         <source>Sampling rate</source>
         <translation>Próbkowanie co</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="464"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1602"/>
         <source>2s</source>
         <translation>2s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="469"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1584"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1603"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1739"/>
         <source>10s</source>
         <translation>10s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1531"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="433"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1665"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
         <source>Units</source>
         <translation>Jednostki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="416"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="255"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
         <source>m/°C</source>
         <translation>m/°C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="421"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="260"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
         <source>ft/°F</source>
         <translation>ft/°F</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="546"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="581"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
         <source>Dive mode color</source>
         <translation>Kolorystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="551"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1608"/>
         <source>Standard</source>
         <translation>Standardowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="556"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1609"/>
         <source>Red</source>
         <translation>Czerwona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="561"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1610"/>
         <source>Green</source>
         <translation>Zielona</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="566"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1611"/>
         <source>Blue</source>
         <translation>Niebieska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="429"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="443"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
         <source>Salinity (0-5%)</source>
         <translation>Zasolenie (0-5%)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1726"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="574"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1860"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1770"/>
         <source>Sync dive computer time with PC</source>
         <translation>Synchronizuj czas z PC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="449"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="608"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
         <source>Compass gain</source>
         <translation>Wzmocnienie kompasu</translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
         <source>Read settings from backup file or from device before writing to the device</source>
         <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do urzadzęnia </translation>
     </message>
     <message>
         <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
         <source>Read settings from backup file or from device before writing to a backup file</source>
         <translation>Wczytuje ustawienia z pliku kopi zapasowej lub z urządzenia przed zapisaniem zmian do pliku kopii zapasowej </translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="203"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
         <source>OSTC, Mk.2/2N/2C</source>
         <translation>OSTC, Mk.2/2N/2C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="484"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
         <source>230LSB/Gauss</source>
         <translation>230LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="471"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="489"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
         <source>330LSB/Gauss</source>
         <translation>330LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="476"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="494"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
         <source>390LSB/Gauss</source>
         <translation>390LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="481"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="499"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
         <source>440LSB/Gauss</source>
         <translation>440LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="486"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="504"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
         <source>660LSB/Gauss</source>
         <translation>660LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="491"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="509"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
         <source>820LSB/Gauss</source>
         <translation>820LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="496"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="514"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
         <source>1090LSB/Gauss</source>
         <translation>1090LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="519"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
         <source>1370LSB/Gauss</source>
         <translation>1370LSB/Gauss</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="591"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1867"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
         <source>Show safety stop</source>
         <translation>Pokazuj przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="601"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
         <source>Reset device to default settings</source>
         <translation>Przywróć ustawienia fabryczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="639"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1953"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1617"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1782"/>
         <source>Alt GF can be selected underwater</source>
         <translation>Alt GF może być wybrany pod wodą</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="194"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
         <source>Suunto Vyper family</source>
         <translation>rodzina Suunto Vyper</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="619"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1947"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
         <source>Advanced settings</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="646"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1970"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1783"/>
         <source>Future TTS</source>
         <translation>Przyszły TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="653"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1619"/>
         <source>Pressure sensor offset</source>
         <translation>Przesunięcie czujnika ciśnienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2071"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="660"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2189"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1620"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1809"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="655"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2064"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="683"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2166"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1622"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1808"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="758"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2019"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1787"/>
         <source>Decotype</source>
         <translation>Model dekompresji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="784"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1629"/>
         <source> mbar</source>
         <translation> mbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="814"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2068"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
         <source> min</source>
         <translation> min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="801"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2030"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1792"/>
         <source>ZH-L16</source>
         <translation>ZH-L16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+        <source>Save libdivecomputer logfile</source>
+        <translation>Zapisz log postępu libdivecomputer </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/>
+        <source>Left button sensitivity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/>
+        <source>Always show ppO2</source>
+        <translation>Zawsze pokazuj ppO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="806"/>
+        <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="851"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="850"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2123"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1802"/>
         <source>Alt GFLow</source>
         <translation>Alt GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="876"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2149"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1641"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1804"/>
         <source>Alt GFHigh</source>
         <translation>Alt GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="893"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
         <source>Flip screen</source>
         <translation>Odwócenie ekranu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="900"/>
+        <source>Right button sensitivity</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="914"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/>
+        <source>Graphical speed indicator</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="928"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2251"/>
+        <source>Bottom gas consumption</source>
+        <translation>Zużycie gazu dennego</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="935"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2258"/>
+        <source>Deco gas consumption</source>
+        <translation>Zużycie gazu deco</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1007"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2266"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1721"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1876"/>
         <source>Gas settings</source>
         <translation>Gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1006"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2127"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1140"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2314"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2399"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1647"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1670"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1814"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1837"/>
         <source>%He</source>
         <translation>%He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1011"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2132"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2217"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1060"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1145"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2319"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2404"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1649"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1672"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1816"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1839"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="931"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1016"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2137"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2222"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1065"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1150"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2324"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2409"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1651"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1674"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1818"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1841"/>
         <source>Change depth</source>
         <translation>Głębokość przełączenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2142"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1070"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2329"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1656"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1823"/>
         <source>Gas 1</source>
         <translation>Gaz 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="941"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2147"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1075"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2334"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1658"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1825"/>
         <source>Gas 2</source>
         <translation>Gaz 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="946"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1080"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1660"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1827"/>
         <source>Gas 3</source>
         <translation>Gaz 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="951"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2157"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1085"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2344"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1662"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1829"/>
         <source>Gas 4</source>
         <translation>Gaz 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="956"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1090"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2349"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1664"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1831"/>
         <source>Gas 5</source>
         <translation>Gaz 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2227"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1155"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2414"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1679"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1846"/>
         <source>Dil 1</source>
         <translation>Dil 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1026"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1160"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2419"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1681"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1848"/>
         <source>Dil 2</source>
         <translation>Dil 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1031"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2237"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1165"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2424"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1683"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1850"/>
         <source>Dil 3</source>
         <translation>Dil 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2242"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1170"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2429"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1685"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1852"/>
         <source>Dil 4</source>
         <translation>Dil 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1041"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1175"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2434"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1687"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1854"/>
         <source>Dil 5</source>
         <translation>Dil 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1086"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2282"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1220"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2469"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
         <source>Set point [cbar]</source>
         <translation>Set point [cbar]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1091"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1225"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2474"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
         <source>Change depth [m]</source>
         <translation>Głębokość zmiany [m] </translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1096"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2292"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1230"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2479"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1698"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1865"/>
         <source>SP 1</source>
         <translation>SP 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1101"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2297"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1235"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2484"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1700"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1867"/>
         <source>SP 2</source>
         <translation>SP 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1106"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2302"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1240"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2489"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1702"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1869"/>
         <source>SP 3</source>
         <translation>SP 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1111"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1245"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1704"/>
         <source>SP 4</source>
         <translation>SP 4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1116"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1250"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1706"/>
         <source>SP 5</source>
         <translation>SP 5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1282"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
         <source>Fixed setpoint</source>
         <translation>Stały setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1287"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1714"/>
         <source>Sensor</source>
         <translation>Czujnik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1295"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1716"/>
         <source>Setpoint fallback</source>
         <translation>Awaryjny setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1200"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1318"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1334"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2510"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2526"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1717"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1718"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1872"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1873"/>
         <source> cbar</source>
         <translation> cbar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1563"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
         <source>P1 (medium)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P1 (średnie)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1568"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
         <source>P2 (high)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P2 (wysokie)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1607"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
         <source>Total dive time</source>
         <translation>Całkowity czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1831"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
         <source>kg/ℓ</source>
         <translation>kg/ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2045"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
         <source>Apnoea</source>
         <translation>Apnoea</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1398"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
         <source>Safety level</source>
         <translation>Konserwatyzm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1001"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="907"/>
+        <source>MOD warning</source>
+        <translation>Przekroczono MOD</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/>
+        <source>Dynamic ascent rate</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="974"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="990"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2219"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2235"/>
+        <source> ℓ/min</source>
+        <translation> ℓ/min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1050"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1135"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2309"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2394"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
         <source>%O₂</source>
         <translation>%O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1258"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
         <source>O₂ in calibration gas</source>
         <translation>O₂ w gazie kalibrującym</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1350"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2542"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1874"/>
         <source>pO₂ max</source>
         <translation>pO₂ max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1357"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2549"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1720"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1875"/>
         <source>pO₂ min</source>
         <translation>pO₂ min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
         <source>Altitude range</source>
         <translation>Zakres wysokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1431"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1724"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1451"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1893"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1725"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1778"/>
         <source>Number of dives</source>
         <translation>Liczba nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1728"/>
         <source>Max depth</source>
         <translation>Głębokość maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1558"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1732"/>
         <source>P0 (none)</source>
         <extracomment>Suunto safety level</extracomment>
         <translation>P0 (brak)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1576"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
         <source>Sample rate</source>
         <translation>Próbkowanie co</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1589"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1740"/>
         <source>20s</source>
         <translation>20s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1594"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1741"/>
         <source>30s</source>
         <translation>30s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1742"/>
         <source>60s</source>
         <translation>60s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1614"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
         <source>Computer model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1589"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1631"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1723"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1746"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1762"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1645"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1749"/>
         <source>24h</source>
         <translation>24h</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1650"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1750"/>
         <source>12h</source>
         <translation>12h</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1658"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1752"/>
         <source>Time format</source>
         <translation>Tryb zegara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1673"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1756"/>
         <source>Imperial</source>
         <translation>Imperialne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1544"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1678"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1757"/>
         <source>Metric</source>
         <translation>Metryczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1689"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1759"/>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1696"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1760"/>
         <source>Light</source>
         <translation>Podświetlenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1713"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1761"/>
         <source>Depth alarm</source>
         <translation>Alarm głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1763"/>
         <source>Time alarm</source>
         <translation>Alarm czasu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1758"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1875"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
         <source>MM/DD/YY</source>
         <translation>MM/DD/YY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1880"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1775"/>
         <source>DD/MM/YY</source>
         <translation>DD/MM/YY</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1776"/>
         <source>YY/MM/DD</source>
         <translation>YY/MM/DD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2040"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
         <source>ZH-L16 CC</source>
         <translation>ZH-L16 CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2050"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
         <source>L16-GF OC</source>
         <translation>L16-GF OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2055"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1797"/>
         <source>L16-GF CC</source>
         <translation>L16-GF CC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2060"/>
+        <location filename="../build/ui_configuredivecomputerdialog.h" line="1798"/>
         <source>PSCR-GF</source>
         <translation>PSCR-GF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1028"/>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1050"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1055"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1077"/>
         <source>Backup files (*.xml)</source>
         <translation>Pliki kopii zapasowych (*.xml)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1034"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1061"/>
         <source>An error occurred while saving the backup file.
 %1</source>
         <translation>Wystąpił błąd podczas zapisywania pliku kopii zapasowej.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1037"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1064"/>
         <source>Backup succeeded</source>
         <translation>Pomyślnie utworzono kopię zapasową.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1038"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1065"/>
         <source>Your settings have been saved to: %1</source>
         <translation>Twoje ustawienia zostały zapisane do: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1027"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
         <source>Backup dive computer settings</source>
         <translation>Tworzy kopię ustawień komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1033"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1060"/>
         <source>XML backup error</source>
         <translation>Błąd kopii zapasowej XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1049"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1076"/>
         <source>Restore dive computer settings</source>
         <translation>Przywraca ustawienia komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1053"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1080"/>
         <source>XML restore error</source>
         <translation>Błąd przywracania XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1054"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1081"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
         <translation>Wystąpił błąd podczas przywracania z pliku kopii zapasowej.
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1060"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1087"/>
         <source>Restore succeeded</source>
         <translation>Pomyślnie przywrócono ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1061"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1088"/>
         <source>Your settings have been restored successfully.</source>
         <translation>Twoje ustawienia zostały pomyślnie przywrócone.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1071"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1098"/>
         <source>Select firmware file</source>
         <translation>Wybierz plik z aktualizacją</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1072"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1099"/>
         <source>All files (*.*)</source>
         <translation>Wszystkie pliki (*.*)</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1160"/>
+        <source>Choose file for divecomputer download logfile</source>
+        <translation>Wybierz plik używany do logowania postępu pobierania danych</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="1161"/>
+        <source>Log files (*.log)</source>
+        <translation>Pliki logów (*.log)</translation>
+    </message>
 </context>
 <context>
     <name>CylindersModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Size</source>
         <translation>Pojemność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Work press.</source>
         <translation>Ciśn. robocze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>Start press.</source>
         <translation>Ciśn. początkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>End press.</source>
         <translation>Ciśn. końcowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="78"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="14"/>
         <source>O₂%</source>
         <translation>O₂%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="79"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="15"/>
         <source>Switch at</source>
         <translation>Zmiana na</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="79"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="15"/>
         <source>Use</source>
         <translation>Użycie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="191"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="124"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknięcie tu usunie butlę z listy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="410"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="342"/>
         <source>Cylinder cannot be removed</source>
         <translation>Butla nie może być usunięta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="411"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="343"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Ten gaz jest używany. Można usuwać tylko gazy, których nie używasz.</translation>
     </message>
@@ -1132,66 +1702,73 @@
     <name>DiveComponentSelectionDialog</name>
     <message>
         <location filename="../qt-ui/divecomponentselection.ui" line="23"/>
+        <location filename="../build/ui_divecomponentselection.h" line="139"/>
         <source>Component selection</source>
         <translation>Wybór parametrów</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="40"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="52"/>
+        <location filename="../build/ui_divecomponentselection.h" line="140"/>
         <source>Which components would you like to copy</source>
         <translation>Które parametry chcesz skopiować?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="46"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="53"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="80"/>
+        <location filename="../build/ui_divecomponentselection.h" line="142"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="60"/>
-        <source>GPS coordinates</source>
-        <translation>Współrzędne GPS</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="67"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="122"/>
+        <location filename="../build/ui_divecomponentselection.h" line="148"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="74"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="129"/>
+        <location filename="../build/ui_divecomponentselection.h" line="149"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="81"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="136"/>
+        <location filename="../build/ui_divecomponentselection.h" line="150"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="88"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="87"/>
+        <location filename="../build/ui_divecomponentselection.h" line="143"/>
         <source>Visibility</source>
         <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="95"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="73"/>
+        <location filename="../build/ui_divecomponentselection.h" line="141"/>
+        <source>Dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divecomponentselection.ui" line="94"/>
+        <location filename="../build/ui_divecomponentselection.h" line="144"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="102"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="101"/>
+        <location filename="../build/ui_divecomponentselection.h" line="145"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="109"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="108"/>
+        <location filename="../build/ui_divecomponentselection.h" line="146"/>
         <source>Weights</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomponentselection.ui" line="116"/>
+        <location filename="../qt-ui/divecomponentselection.ui" line="115"/>
+        <location filename="../build/ui_divecomponentselection.h" line="147"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
@@ -1199,12 +1776,12 @@
 <context>
     <name>DiveComputerManagementDialog</name>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="48"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
         <translation>Usunąć wybrany komputer nurkowy?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="49"/>
+        <location filename="../qt-ui/divecomputermanagementdialog.cpp" line="50"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
         <translation>Czy na pewno chcesz usunąć
@@ -1212,6 +1789,7 @@ wybrany komputer nurkowy?</translation>
     </message>
     <message>
         <location filename="../qt-ui/divecomputermanagementdialog.ui" line="17"/>
+        <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
         <source>Edit dive computer nicknames</source>
         <translation>Edycja nazw komputerów nurkowych</translation>
     </message>
@@ -1219,22 +1797,22 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveComputerModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1616"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Model</source>
         <translation>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1616"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1616"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Nickname</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1652"/>
+        <location filename="../qt-models/divecomputermodel.cpp" line="41"/>
         <source>Clicking here will remove this dive computer.</source>
         <translation>Kliknięcie tu usunie ten komputer nurkowy.</translation>
     </message>
@@ -1242,18 +1820,18 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveEventItem</name>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="115"/>
-        <source>Bailing out to OC</source>
-        <translation>Przejście na obieg otwarty</translation>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="116"/>
+        <source>Manual switch to OC</source>
+        <translation>Ręczna zmiana na OC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="117"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
         <source> begin</source>
         <comment>Starts with space!</comment>
         <translation> początek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveeventitem.cpp" line="118"/>
+        <location filename="../qt-ui/profile/diveeventitem.cpp" line="119"/>
         <source> end</source>
         <comment>Starts with space!</comment>
         <translation> koniec</translation>
@@ -1262,27 +1840,27 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveImportedModel</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="562"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="652"/>
         <source>Date/time</source>
         <translation>Data/czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="564"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="654"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="566"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="656"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/>
         <source>h:</source>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="588"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="678"/>
         <source>min</source>
         <translation>min</translation>
     </message>
@@ -1290,97 +1868,97 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1248"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="192"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1251"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="195"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1254"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="198"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1257"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="201"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1260"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="204"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1263"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="207"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
         <source>Weight(%1)</source>
         <translation>Balast(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1266"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="210"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1269"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="213"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1272"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="216"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1275"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="219"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1280"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="224"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1283"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="227"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1286"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="230"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1289"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="233"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -1388,87 +1966,92 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveListView</name>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="768"/>
+        <location filename="../qt-ui/divelistview.cpp" line="837"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="769"/>
+        <location filename="../qt-ui/divelistview.cpp" line="839"/>
         <source>Collapse all</source>
         <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="770"/>
+        <location filename="../qt-ui/divelistview.cpp" line="843"/>
         <source>Collapse others</source>
         <translation>Zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="772"/>
+        <location filename="../qt-ui/divelistview.cpp" line="847"/>
         <source>Remove dive(s) from trip</source>
         <translation>Usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="773"/>
+        <location filename="../qt-ui/divelistview.cpp" line="848"/>
         <source>Create new trip above</source>
         <translation>Utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="787"/>
+        <location filename="../qt-ui/divelistview.cpp" line="862"/>
         <source>Add dive(s) to trip immediately above</source>
         <translation>Dodaj nurkowanie(a) do grupy powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="789"/>
+        <location filename="../qt-ui/divelistview.cpp" line="864"/>
         <source>Add dive(s) to trip immediately below</source>
         <translation>Dodaj nurkowanie(a) do grupy poniżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="793"/>
+        <location filename="../qt-ui/divelistview.cpp" line="868"/>
         <source>Merge trip with trip above</source>
         <translation>Połącz grupę z grupą powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="794"/>
+        <location filename="../qt-ui/divelistview.cpp" line="869"/>
         <source>Merge trip with trip below</source>
         <translation>Połącz grupę z grupą poniżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="798"/>
+        <location filename="../qt-ui/divelistview.cpp" line="873"/>
         <source>Delete dive(s)</source>
         <translation>Usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="800"/>
+        <location filename="../qt-ui/divelistview.cpp" line="875"/>
         <source>Mark dive(s) invalid</source>
         <translation>Oznacz nurkowanie(a) jak niepoprawne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="804"/>
+        <location filename="../qt-ui/divelistview.cpp" line="879"/>
         <source>Merge selected dives</source>
         <translation>Połącz wybrane nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="806"/>
+        <location filename="../qt-ui/divelistview.cpp" line="881"/>
         <source>Renumber dive(s)</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="807"/>
-        <source>Shift times</source>
-        <translation>Zmień czas</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="882"/>
+        <source>Shift dive times</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="808"/>
-        <source>Load images</source>
-        <translation>Dodaj zdjęcia</translation>
+        <location filename="../qt-ui/divelistview.cpp" line="883"/>
+        <source>Load image(s) from file(s)</source>
+        <translation>Załaduj obraz(y) z pliku(ów)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="831"/>
+        <location filename="../qt-ui/divelistview.cpp" line="884"/>
+        <source>Load image(s) from web</source>
+        <translation>Załaduj obraz(y) z internetu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelistview.cpp" line="907"/>
         <source>Open image files</source>
         <translation>Dodawanie zdjęć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="831"/>
+        <location filename="../qt-ui/divelistview.cpp" line="907"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -1476,277 +2059,330 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DiveLogExportDialog</name>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="103"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="351"/>
         <source>Export format</source>
         <translation>Format danych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="88"/>
-        <source>Subsurface XML</source>
-        <translation>Subsurface XML</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="107"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="134"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="353"/>
         <source>UDDF</source>
         <translation>UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="120"/>
-        <source>divelogs.de</source>
-        <translation>divelogs.de</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="160"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="187"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="358"/>
         <source>Worldmap</source>
         <translation>Mapa Świata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="210"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="197"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+        <source>I&amp;mage depths</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="243"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="360"/>
         <source>Selection</source>
         <translation>Wybór</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="219"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="305"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="252"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="346"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="372"/>
         <source>Selected dives</source>
         <translation>Wybrane nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="229"/>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="334"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="262"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="362"/>
         <source>All dives</source>
         <translation>Wszystkie nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="277"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="306"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="396"/>
         <source>HTML</source>
         <translation>HTML</translation>
     </message>
     <message>
         <location filename="../qt-ui/divelogexportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="349"/>
         <source>Export dive log files</source>
         <translation>Eksportowanie nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="29"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="44"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="369"/>
         <source>General export</source>
         <translation>Podstawowy eksport</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="130"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="115"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="352"/>
+        <source>Subsurface &amp;XML</source>
+        <translation>Subsurface XML</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/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="../build/ui_divelogexportdialog.h" line="355"/>
         <source>DiveShare</source>
         <translation>DiveShare</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="140"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="167"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="356"/>
         <source>CSV dive profile</source>
         <translation>Profil nurkowania CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="150"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="177"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="357"/>
         <source>CSV dive details</source>
         <translation>Dane o nurkowaniu CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="170"/>
-        <source>Image depths</source>
-        <translation>Głębokości zdjęć</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="248"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="275"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="363"/>
         <source>CSV units</source>
         <translation>Jednostki CSV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="261"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="288"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="366"/>
         <source>Metric</source>
         <translation>Metryczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="266"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="293"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="367"/>
         <source>Imperial</source>
         <translation>Imperialne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="283"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="324"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="370"/>
         <source>General settings</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="289"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="330"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="371"/>
         <source>Subsurface numbers</source>
         <translation>Zachowaj numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="318"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="359"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="373"/>
         <source>Export yearly statistics</source>
         <translation>Eksport statystyk rocznych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="344"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="375"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="374"/>
+        <source>All di&amp;ves</source>
+        <translation>Wszystkie nurkowania</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="385"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="375"/>
         <source>Export list only</source>
         <translation>Eksportuj tylko listę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="357"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="392"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="376"/>
+        <source>Export photos</source>
+        <translation>Eksport zdjęć</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="408"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="377"/>
         <source>Style options</source>
         <translation>Ustawienia stylu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="369"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="423"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="378"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="379"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="433"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="379"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="390"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="444"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="382"/>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="395"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="449"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="383"/>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="400"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="454"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="384"/>
         <source>12</source>
         <translation>12</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="405"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="459"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="385"/>
         <source>14</source>
         <translation>14</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="410"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="464"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="386"/>
         <source>16</source>
         <translation>16</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="415"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="469"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="387"/>
         <source>18</source>
         <translation>18</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="420"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="474"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="388"/>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="428"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="482"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="390"/>
         <source>Theme</source>
         <translation>Motyw</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="439"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="493"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="393"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="95"/>
         <source>Light</source>
         <translation>Światło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.ui" line="444"/>
+        <location filename="../qt-ui/divelogexportdialog.ui" line="498"/>
+        <location filename="../build/ui_divelogexportdialog.h" line="394"/>
         <source>Sand</source>
         <translation>Piasek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="264"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="149"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="268"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="272"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="153"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="157"/>
         <source>CSV files (*.csv *.CSV)</source>
         <translation>pliki CSV (*.csv *.CSV)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="68"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
         <translation>Format używany do wymiany danych pomiędzy różnorodnymi programami związanymi z nurkowaniem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="70"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
         <source>Comma separated values describing the dive profile.</source>
         <translation>Lista oddzielonych przecinkami danych opisujących profil nurkowania. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="72"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
         <translation>Lista oddzielonych przecinkami najważniejszych informacji z  nurkowania. Nie obejmuje to profilu nurkowania.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="74"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
         <source>Send the dive data to divelogs.de website.</source>
         <translation>Wysyła dane na stronę divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="76"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
         <translation>Wysyła dane do strony dive-share.appspot.com</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="78"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
         <translation>Eksport danych o miejscach nurkowych w HTML z zaznaczeniem ich na mapie świata. </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="80"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="86"/>
         <source>Subsurface native XML format.</source>
         <translation>Format XML używany przez Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/>
         <source>Write depths of images to file.</source>
         <translation>Zapisuje głębokości zdjęć do pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="263"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="148"/>
         <source>Export UDDF file as</source>
         <translation>Eksportuj plik UDDF jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="267"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="271"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="152"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="156"/>
         <source>Export CSV file as</source>
         <translation>Eksportuj plik CSV jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="278"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/>
         <source>Export world map</source>
         <translation>Eksport mapy świata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="279"/>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="299"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="164"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="184"/>
         <source>HTML files (*.html)</source>
         <translation>Pliki HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="283"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/>
         <source>Export Subsurface XML</source>
         <translation>Eksport Subsurface XML</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="284"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="169"/>
         <source>XML files (*.xml *.ssrf)</source>
         <translation>Pliki XML (*.xml *.ssrf)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="292"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/>
         <source>Save image depths</source>
         <translation>Zapisz głębokości zdjeć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="298"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="183"/>
         <source>Export HTML files as</source>
         <translation>Eksportuj pliki HTML jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogexportdialog.cpp" line="346"/>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="199"/>
+        <source>Please wait, exporting...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogexportdialog.cpp" line="234"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nie można otworzyć pliku %s</translation>
     </message>
@@ -1755,236 +2391,300 @@ wybrany komputer nurkowy?</translation>
     <name>DiveLogImportDialog</name>
     <message>
         <location filename="../qt-ui/divelogimportdialog.ui" line="14"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="149"/>
         <source>Import dive log file</source>
         <translation>Importowanie logów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="578"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="780"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="97"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="127"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="164"/>
         <source>Metric</source>
         <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="102"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="132"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="165"/>
         <source>Imperial</source>
         <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="59"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="89"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="152"/>
         <source>dd.mm.yyyy</source>
         <translation>dd.mm.yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="64"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="94"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="153"/>
         <source>mm/dd/yyyy</source>
         <translation>mm/dd/yyyy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="69"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="99"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="154"/>
         <source>yyyy-mm-dd</source>
         <translation>yyyy-mm-dd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="125"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="155"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="167"/>
         <source>Drag the tags above to each corresponding column below</source>
         <translation>Przeciągnij powyższe tagi do odpowiadających im kolumn poniżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="576"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="776"/>
         <source>Dive #</source>
         <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="778"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="782"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="786"/>
         <source>GPS</source>
         <translation>GPS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="588"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="788"/>
+        <source>Max. depth</source>
+        <translation>Maks. głębokość</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="790"/>
+        <source>Avg. depth</source>
+        <translation>Śr. głębokość </translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="796"/>
+        <source>Suit</source>
+        <translation>Skafander</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="609"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="802"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="592"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="598"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="818"/>
         <source>O₂</source>
         <translation>O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="820"/>
         <source>He</source>
         <translation>He</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="78"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="108"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="158"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="83"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="113"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="159"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.ui" line="88"/>
+        <location filename="../qt-ui/divelogimportdialog.ui" line="118"/>
+        <location filename="../build/ui_divelogimportdialog.h" line="160"/>
         <source>Minutes:seconds</source>
         <translation>Minuty:sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="580"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="784"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="582"/>
-        <source>Max depth</source>
-        <translation>Głębokość maksymalna</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="326"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="393"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="397"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="342"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="469"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
         <source>Tab</source>
         <translation>Tab</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="435"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="521"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
         <translation>Niektóre nagłówki kolumn zostały uzupełnione automatycznie; przeciągnij pozostałe nagłówki do odpowiadających im kolumn.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="473"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="530"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="553"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="570"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="599"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="662"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="713"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="772"/>
         <source>Sample time</source>
         <translation>Czas próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="475"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="531"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="554"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="600"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="664"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="715"/>
         <source>Sample depth</source>
         <translation>Głębokość próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="477"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="532"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="555"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="601"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="563"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="666"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="717"/>
         <source>Sample temperature</source>
         <translation>Temperatura próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="487"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="537"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="560"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="567"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="670"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="721"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="569"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="672"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="723"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="571"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="674"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="725"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="579"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="682"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="733"/>
         <source>Sample stopdepth</source>
         <translation>Przystanek próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="479"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="533"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="556"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="686"/>
+        <source>Sample setpoint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="565"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="668"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="719"/>
         <source>Sample pO₂</source>
         <translation>pO₂ próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="481"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="534"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="557"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="573"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="676"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="727"/>
         <source>Sample CNS</source>
         <translation>CNS próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="483"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="535"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="558"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="604"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="575"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="678"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="729"/>
         <source>Sample NDL</source>
         <translation>NDL próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="485"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="536"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="559"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="577"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="680"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="731"/>
         <source>Sample TTS</source>
         <translation>TTS próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="489"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="538"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="561"/>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="581"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="684"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="735"/>
         <source>Sample pressure</source>
         <translation>Ciśnienie próbki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="583"/>
-        <source>Mean depth</source>
-        <translation>Głębokość średnia</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="584"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="602"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="792"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="585"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="603"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="794"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="586"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="605"/>
+        <source>Rating</source>
+        <translation>Ocena</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="606"/>
+        <source>Visibility</source>
+        <translation>Widzialność</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="607"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="798"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="587"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="608"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="800"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="589"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="812"/>
         <source>Cyl. size</source>
         <translation>Rozmiar butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="590"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="596"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="814"/>
         <source>Start pressure</source>
         <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="591"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="597"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="816"/>
         <source>End pressure</source>
         <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="593"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="822"/>
         <source>Air temp.</source>
         <translation>Temp. powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelogimportdialog.cpp" line="595"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="594"/>
+        <location filename="../qt-ui/divelogimportdialog.cpp" line="824"/>
         <source>Water temp.</source>
         <translation>Temp. wody</translation>
     </message>
@@ -1993,36 +2693,43 @@ wybrany komputer nurkowy?</translation>
     <name>DivePlanner</name>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="152"/>
+        <location filename="../build/ui_diveplanner.h" line="190"/>
         <source>Altitude</source>
         <translation>Wysokość</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="109"/>
+        <location filename="../build/ui_diveplanner.h" line="189"/>
         <source>Planned dive time</source>
         <translation>Planowany czas zanurzenia</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="159"/>
+        <location filename="../build/ui_diveplanner.h" line="191"/>
         <source>ATM pressure</source>
         <translation>Ciśnienie atmosferyczne</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="166"/>
+        <location filename="../build/ui_diveplanner.h" line="192"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="179"/>
+        <location filename="../build/ui_diveplanner.h" line="193"/>
         <source>mbar</source>
         <translation>mbar</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="198"/>
+        <location filename="../build/ui_diveplanner.h" line="194"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
         <location filename="../qt-ui/diveplanner.ui" line="220"/>
+        <location filename="../build/ui_diveplanner.h" line="195"/>
         <source> kg/ℓ</source>
         <translation> kg/ℓ</translation>
     </message>
@@ -2030,65 +2737,55 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="132"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="124"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="691"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="297"/>
         <source>Final depth</source>
         <translation>Głębokość końcowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="693"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="299"/>
         <source>Run time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="695"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="301"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="697"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="303"/>
         <source>Used gas</source>
         <translation>Używany gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="699"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="305"/>
         <source>CC set point</source>
         <translation>CC set point</translation>
     </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1051"/>
-        <source>Discard the plan?</source>
-        <translation>Porzucić plan?</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="1052"/>
-        <source>You are about to discard your plan.</source>
-        <translation>Masz zamiar porzucić plan</translation>
-    </message>
 </context>
 <context>
     <name>DivePlannerWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="257"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="104"/>
         <source>Dive planner points</source>
         <translation>Plan nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="261"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="108"/>
         <source>Available gases</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="284"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="133"/>
         <source>Add dive data point</source>
         <translation>dodaj punkt do profilu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="293"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="142"/>
         <source>Save new</source>
         <translation>Zapisz nowy</translation>
     </message>
@@ -2096,112 +2793,112 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivePlotDataModel</name>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="109"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="112"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="111"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="113"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/>
         <source>Pressure</source>
         <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="115"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/>
         <source>Color</source>
         <translation>Kolor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="123"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Pressure S</source>
         <translation>Ciśnienie S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="131"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>pN₂</source>
         <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="133"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="135"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/>
         <source>Setpoint</source>
         <translation>Setpoint</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="139"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Sensor 1</source>
         <translation>Czujnik 1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="141"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
         <source>Sensor 2</source>
         <translation>Czujnik 2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="143"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/>
         <source>Sensor 3</source>
         <translation>Czujnik 3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="147"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
         <source>Heart rate</source>
         <translation>Tętno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="151"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Mean depth @ s</source>
         <translation>Głębokość średnia @ s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="145"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/>
         <source>Ambient pressure</source>
         <translation>Cisnienie otoczenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="149"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Gradient factor</source>
         <translation>Gradient factor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="125"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
         <source>Pressure I</source>
         <translation>Ciśnienie I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="119"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/>
         <source>User entered</source>
         <translation>Podane przez użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="121"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>Cylinder index</source>
         <translation>Numer butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="127"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
         <source>Ceiling</source>
         <translation>Sufit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/>
+        <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
@@ -2210,169 +2907,187 @@ wybrany komputer nurkowy?</translation>
     <name>DiveShareExportDialog</name>
     <message>
         <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="176"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="34"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="61"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="177"/>
         <source>User ID</source>
         <translation>ID użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="75"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="181"/>
         <source>⌫</source>
         <translation>⌫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="82"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="182"/>
         <source>Get user ID</source>
         <translation>Pobierz ID użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="91"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="183"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt; Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&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; Nie korzystanie z USerID oznacza, że będziesz musiał(a) zapisał linka do swoich nurkowań, by móc znaleźć je ponownie.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="104"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="185"/>
         <source>Private dives will not appear in &quot;related dives&quot; lists, and will only be accessible if their URL is known.</source>
         <translation>Prywatne nurkowania nie są widoczne na liście &quot;nurkowań powiązanych&quot; i będą dostępne tylko w przypadku, gdy znasz ich adres URL.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="107"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="187"/>
         <source>Keep dives private</source>
         <translation>Zachowaj nurkowania jako prywatne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="129"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="188"/>
         <source>Upload dive data</source>
         <translation>Wyślij nurkowania</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/diveshareexportdialog.ui" line="174"/>
+        <location filename="../build/ui_diveshareexportdialog.h" line="189"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Oxygen-Sans'; font-size:7pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1443"/>
-        <location filename="../qt-ui/models.cpp" line="1489"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="393"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="439"/>
         <source>#</source>
         <translation>Nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1446"/>
-        <location filename="../qt-ui/models.cpp" line="1492"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="396"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="442"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1449"/>
-        <location filename="../qt-ui/models.cpp" line="1495"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="399"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="445"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1452"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="402"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1458"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="408"/>
         <source>Temp</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1461"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="411"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1473"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="423"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
         <source>Weight(%1)</source>
         <translation>Balast(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1464"/>
-        <location filename="../qt-ui/models.cpp" line="1510"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="414"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="460"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1467"/>
-        <location filename="../qt-ui/models.cpp" line="1513"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="417"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="463"/>
         <source>Cyl</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1470"/>
-        <location filename="../qt-ui/models.cpp" line="1516"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="420"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="466"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
         <source>SAC(%1)</source>
         <translation>SAC(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1521"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="471"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1479"/>
-        <location filename="../qt-ui/models.cpp" line="1527"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="429"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="477"/>
         <source>Max CNS</source>
         <translation>Max CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1482"/>
-        <location filename="../qt-ui/models.cpp" line="1530"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="432"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="480"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1498"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="448"/>
         <source>Depth(%1)</source>
         <translation>Głębokość(%1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1455"/>
-        <location filename="../qt-ui/models.cpp" line="1501"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="405"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="451"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1504"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="454"/>
         <source>Temp(%1%2)</source>
         <translation>Temperatura(%1%2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1507"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="457"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1476"/>
-        <location filename="../qt-ui/models.cpp" line="1524"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="426"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="474"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
@@ -2380,95 +3095,96 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DivelogsDeWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="98"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="152"/>
         <source>no dives were selected</source>
         <translation>nie wybrano żadnych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="117"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="171"/>
         <source>failed to create zip file for upload: %s</source>
         <translation>nie udało się utworzyć pliku zip do wysłania: %s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="143"/>
-        <source>cannot create temporary file: %s</source>
-        <translation>nie można utworzyć pliku tymczasowego: %s</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="153"/>
-        <source>internal error: %s</source>
-        <translation>błąd wewnętrzny: %s</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="169"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="224"/>
         <source>internal error</source>
         <translation>błąd wewnętrzny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="629"/>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="828"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="711"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="901"/>
         <source>Done</source>
         <translation>Zakończ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="660"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="744"/>
         <source>Uploading dive list...</source>
         <translation>Wysyłanie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="692"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="776"/>
         <source>Downloading dive list...</source>
         <translation>Pobieranie listy nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="741"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="817"/>
         <source>Downloading %1 dives...</source>
         <translation>Pobieranie %1 nurkowań...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="785"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
         <source>Download finished - %1</source>
         <translation>Zakończono pobieranie - %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="802"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="865"/>
+        <source>Problem with download</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/>
+        <source>The archive could not be opened:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="875"/>
         <source>Corrupted download</source>
         <translation>Pobrano uskodzone dane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="876"/>
         <source>The archive could not be opened:
 %1</source>
         <translation>Archiwum nie mogło zostać otworzone:
 %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="842"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="915"/>
         <source>Upload failed</source>
         <translation>Wysyłanie nieudane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="845"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="918"/>
         <source>Upload successful</source>
         <translation>Wysyłanie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="848"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="921"/>
         <source>Login failed</source>
         <translation>Błąd logowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="851"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="924"/>
         <source>Cannot parse response</source>
         <translation>Nie można przetworzyć odpowiedzi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="862"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="935"/>
         <source>Error: %1</source>
         <translation>Błąd: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="829"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="902"/>
         <source>Upload finished</source>
         <translation>Wysyłanie zakończone</translation>
     </message>
@@ -2476,52 +3192,57 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DownloadFromDCWidget</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="169"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="185"/>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="400"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="444"/>
         <source>Retry</source>
         <translation>Ponów</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="264"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="280"/>
         <source>Find Uemis dive computer</source>
         <translation>Wykryj komputer Uemis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="97"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="101"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="346"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="104"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="390"/>
         <source>Choose file for divecomputer download logfile</source>
         <translation>Wybierz plik używany do logowania postępu pobierania danych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="347"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="391"/>
         <source>Log files (*.log)</source>
         <translation>Pliki logów (*.log)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="362"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="406"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="363"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="407"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
         <translation>Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="374"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="418"/>
         <source>Choose file for divecomputer binary dump file</source>
         <translation>Wybierz plik do którego zapisane zostaną dane binarne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="375"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="419"/>
         <source>Dump files (*.bin)</source>
         <translation>Pliki binarne (*.bin)</translation>
     </message>
@@ -2529,84 +3250,113 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>DownloadFromDiveComputer</name>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="139"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
         <source>Vendor</source>
         <translation>Producent</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="14"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
         <source>Download from dive computer</source>
         <translation>Pobierz z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="31"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="266"/>
         <source>Device or mount point</source>
         <translation>Urządzenie lub punkt montowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="111"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="122"/>
+        <source>Choose Bluetooth download mode</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="149"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
         <source>Dive computer</source>
         <translation>Komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="101"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="115"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="132"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="267"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="272"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="274"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="52"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="268"/>
         <source>Force download of all dives</source>
         <translation>Wymuś pobranie wszystkich nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="80"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="269"/>
         <source>Always prefer downloaded dives</source>
         <translation>Pobrane dane mają priorytet </translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="138"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="129"/>
+        <source>Select a remote Bluetooth device.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="179"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="182"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="284"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="189"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="291"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="210"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="226"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
         <source>Downloaded dives</source>
         <translation>Pobrane nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="217"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="236"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="279"/>
         <source>Select all</source>
         <translation>Wybierz wszystko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="224"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="243"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="280"/>
         <source>Unselect all</source>
         <translation>Odznacz wszystko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="73"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="94"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
         <source>Save libdivecomputer logfile</source>
         <translation>Zapisz log postępu libdivecomputer </translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="108"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
         <source>Save libdivecomputer dumpfile</source>
         <translation>Zapisz zrzut danych libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="66"/>
+        <location filename="../qt-ui/downloadfromdivecomputer.ui" line="87"/>
+        <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
         <source>Download into new trip</source>
         <translation>Dodaj do nowej grupy</translation>
     </message>
@@ -2614,12 +3364,12 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>ExtraDataModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2286"/>
+        <location filename="../qt-models/divecomputerextradatamodel.cpp" line="10"/>
         <source>Key</source>
         <translation>Klucz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2286"/>
+        <location filename="../qt-models/divecomputerextradatamodel.cpp" line="10"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
@@ -2627,22 +3377,22 @@ wybrany komputer nurkowy?</translation>
 <context>
     <name>FacebookManager</name>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="245"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="259"/>
         <source>Photo upload sucessfull</source>
         <translation>Wysyłanie zdjęć zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="246"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="260"/>
         <source>Your dive profile was updated to Facebook.</source>
         <translation>Twój profil nurkowania został wysłany do Facebooka.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="250"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="264"/>
         <source>Photo upload failed</source>
         <translation>Wysyłanie zdjęć nieudane</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="251"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="265"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
@@ -2654,16 +3404,19 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
     <name>FilterWidget</name>
     <message>
         <location filename="../qt-ui/listfilter.ui" line="14"/>
+        <location filename="../build/ui_listfilter.h" line="74"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="22"/>
+        <location filename="../qt-ui/listfilter.ui" line="40"/>
+        <location filename="../build/ui_listfilter.h" line="75"/>
         <source>Text label</source>
         <translation>Text label</translation>
     </message>
     <message>
-        <location filename="../qt-ui/listfilter.ui" line="32"/>
+        <location filename="../qt-ui/listfilter.ui" line="50"/>
+        <location filename="../build/ui_listfilter.h" line="76"/>
         <source>Filter this list</source>
         <translation>Filtruj listę</translation>
     </message>
@@ -2672,16 +3425,19 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
     <name>FilterWidget2</name>
     <message>
         <location filename="../qt-ui/filterwidget.ui" line="73"/>
+        <location filename="../build/ui_filterwidget.h" line="118"/>
         <source>Reset filters</source>
         <translation>Wyczyść filtry</translation>
     </message>
     <message>
         <location filename="../qt-ui/filterwidget.ui" line="87"/>
+        <location filename="../build/ui_filterwidget.h" line="121"/>
         <source>Show/hide filters</source>
         <translation>Pokaż/ukryj filtry</translation>
     </message>
     <message>
         <location filename="../qt-ui/filterwidget.ui" line="101"/>
+        <location filename="../build/ui_filterwidget.h" line="124"/>
         <source>Close and reset filters</source>
         <translation>Wyczyść filtry i zamknij</translation>
     </message>
@@ -2689,17 +3445,22 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>FirmwareUpdateThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1623"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1749"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1784"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1626"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1786"/>
         <source>Firmware update failed!</source>
         <translation>Aktualizacja oprogramowania nieudana!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1629"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1789"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -2707,360 +3468,575 @@ Prześlij proszę poniższą informację programistom Subsurface.</translation>
 <context>
     <name>GlobeGPS</name>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="119"/>
+        <location filename="../qt-ui/globe.cpp" line="124"/>
         <source>Edit selected dive locations</source>
         <translation>Wskaż miejsce zaznaczonych nurkowań</translation>
     </message>
 </context>
 <context>
+    <name>KMessageWidget</name>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="90"/>
+        <source>&amp;Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/kmessagewidget.cpp" line="91"/>
+        <source>Close message</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>LocationFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="549"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="622"/>
         <source>Location: </source>
         <translation>Miejsce:</translation>
     </message>
 </context>
 <context>
+    <name>LocationFilterDelegate</name>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="540"/>
+        <source> (same GPS fix)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="545"/>
+        <source> (~%1 away</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <location filename="../qt-ui/modeldelegates.cpp" line="546"/>
+        <source>, %n dive(s) here)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="551"/>
+        <source>(no existing GPS data, add GPS fix from this dive)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="553"/>
+        <source>(no GPS data)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/modeldelegates.cpp" line="555"/>
+        <source>Pick site: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>LocationFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="283"/>
+        <location filename="../qt-models/filtermodels.cpp" line="286"/>
         <source>No location set</source>
         <translation>nie podano miejsca</translation>
     </message>
 </context>
 <context>
-    <name>MainTab</name>
+    <name>LocationInformation</name>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="160"/>
-        <location filename="../qt-ui/maintab.cpp" line="498"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
+        <location filename="../qt-ui/locationInformation.ui" line="14"/>
+        <location filename="../build/ui_locationInformation.h" line="111"/>
+        <source>GroupBox</source>
+        <translation>GroupBox</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="29"/>
+        <location filename="../build/ui_locationInformation.h" line="113"/>
+        <source>Name</source>
+        <translation>Nazwa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="36"/>
+        <location filename="../build/ui_locationInformation.h" line="115"/>
+        <source>Description</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="43"/>
+        <location filename="../build/ui_locationInformation.h" line="116"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="65"/>
+        <location filename="../qt-ui/locationInformation.ui" line="53"/>
+        <location filename="../build/ui_locationInformation.h" line="114"/>
         <source>Coordinates</source>
         <translation>Współrzędne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="167"/>
+        <location filename="../qt-ui/locationInformation.ui" line="69"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationInformation.ui" line="90"/>
+        <source>Dive sites on same coordinates</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_locationInformation.h" line="112"/>
+        <source>Dive Site</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocationInformationModel</name>
+    <message>
+        <location filename="../qt-models/divelocationmodel.cpp" line="67"/>
+        <source>Create dive site with this name</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>LocationInformationWidget</name>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="22"/>
+        <source>Apply changes</source>
+        <translation>Zastosuj zmiany</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="25"/>
+        <source>Discard changes</source>
+        <translation>Porzuć zmiany</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="28"/>
+        <location filename="../qt-ui/locationinformation.cpp" line="209"/>
+        <source>Dive site management</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="61"/>
+        <source>Merge dive Sites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="70"/>
+        <source>Merging dive sites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="71"/>
+        <source>You are about to merge dive sites, you can't undo that action 
+ Are you sure you want to continue?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/locationinformation.cpp" line="216"/>
+        <source>You are editing a dive site</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainTab</name>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="184"/>
+        <location filename="../build/ui_maintab.h" line="951"/>
+        <location filename="../qt-ui/maintab.cpp" line="642"/>
+        <source>Location</source>
+        <translation>Miejsce</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="249"/>
+        <location filename="../build/ui_maintab.h" line="954"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="174"/>
+        <location filename="../qt-ui/maintab.ui" line="259"/>
+        <location filename="../build/ui_maintab.h" line="955"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="275"/>
+        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../build/ui_maintab.h" line="959"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="206"/>
+        <location filename="../qt-ui/maintab.ui" line="305"/>
+        <location filename="../build/ui_maintab.h" line="956"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="219"/>
+        <location filename="../qt-ui/maintab.ui" line="318"/>
+        <location filename="../build/ui_maintab.h" line="957"/>
         <source>Visibility</source>
         <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="228"/>
+        <location filename="../qt-ui/maintab.ui" line="325"/>
+        <location filename="../build/ui_maintab.h" line="958"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="18"/>
-        <location filename="../qt-ui/maintab.cpp" line="471"/>
-        <source>Dive notes</source>
-        <translation>Notatki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="72"/>
+        <location filename="../qt-ui/maintab.ui" line="394"/>
+        <location filename="../build/ui_maintab.h" line="960"/>
         <source>Dive mode</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="100"/>
-        <location filename="../qt-ui/maintab.ui" line="675"/>
-        <location filename="../qt-ui/maintab.cpp" line="280"/>
+        <location filename="../qt-ui/maintab.ui" line="112"/>
+        <location filename="../qt-ui/maintab.ui" line="866"/>
+        <location filename="../build/ui_maintab.h" line="949"/>
+        <location filename="../build/ui_maintab.h" line="987"/>
+        <location filename="../qt-ui/maintab.cpp" line="365"/>
         <source>Air temp.</source>
         <translation>Temp. powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="107"/>
-        <location filename="../qt-ui/maintab.ui" line="694"/>
-        <location filename="../qt-ui/maintab.cpp" line="281"/>
+        <location filename="../qt-ui/maintab.ui" line="122"/>
+        <location filename="../qt-ui/maintab.ui" line="885"/>
+        <location filename="../build/ui_maintab.h" line="950"/>
+        <location filename="../build/ui_maintab.h" line="989"/>
+        <location filename="../qt-ui/maintab.cpp" line="366"/>
         <source>Water temp.</source>
         <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="282"/>
-        <location filename="../qt-ui/maintab.cpp" line="499"/>
+        <location filename="../qt-ui/maintab.ui" line="18"/>
+        <location filename="../qt-ui/maintab.ui" line="436"/>
+        <location filename="../build/ui_maintab.h" line="961"/>
+        <location filename="../build/ui_maintab.h" line="963"/>
+        <location filename="../qt-ui/maintab.cpp" line="617"/>
+        <location filename="../qt-ui/maintab.cpp" line="643"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="396"/>
+        <location filename="../qt-ui/maintab.ui" line="21"/>
+        <location filename="../build/ui_maintab.h" line="964"/>
+        <source>General notes about the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="214"/>
+        <source>Edit dive site</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="217"/>
+        <location filename="../build/ui_maintab.h" line="953"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="521"/>
+        <location filename="../build/ui_maintab.h" line="965"/>
         <source>Equipment</source>
         <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="523"/>
+        <location filename="../qt-ui/maintab.ui" line="524"/>
+        <location filename="../build/ui_maintab.h" line="966"/>
+        <source>Used equipment in the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="616"/>
+        <location filename="../build/ui_maintab.h" line="994"/>
+        <source>Info</source>
+        <translation>Informacje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="619"/>
+        <location filename="../build/ui_maintab.h" line="995"/>
+        <source>Dive information</source>
+        <translation>Informacje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="714"/>
+        <location filename="../build/ui_maintab.h" line="971"/>
         <source>Gases used</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="542"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
+        <location filename="../build/ui_maintab.h" line="973"/>
         <source>Gas consumed</source>
         <translation>Zużyty gaz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="580"/>
+        <location filename="../qt-ui/maintab.ui" line="771"/>
+        <location filename="../build/ui_maintab.h" line="977"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="618"/>
+        <location filename="../qt-ui/maintab.ui" line="809"/>
+        <location filename="../build/ui_maintab.h" line="981"/>
         <source>Max. depth</source>
         <translation>Maks. głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="656"/>
+        <location filename="../qt-ui/maintab.ui" line="847"/>
+        <location filename="../build/ui_maintab.h" line="985"/>
         <source>Air pressure</source>
         <translation>Ciśn. atmosferyczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="713"/>
+        <location filename="../qt-ui/maintab.ui" line="904"/>
+        <location filename="../build/ui_maintab.h" line="991"/>
         <source>Dive time</source>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="872"/>
+        <location filename="../qt-ui/maintab.ui" line="963"/>
+        <location filename="../build/ui_maintab.h" line="1007"/>
+        <source>Simple statistics about the selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="1069"/>
+        <location filename="../build/ui_maintab.h" line="999"/>
         <source>Total time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="930"/>
+        <location filename="../qt-ui/maintab.ui" line="1136"/>
+        <location filename="../build/ui_maintab.h" line="1004"/>
         <source>Gas consumption</source>
         <translation>Zużycie gazu
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="989"/>
+        <location filename="../qt-ui/maintab.ui" line="1181"/>
+        <location filename="../build/ui_maintab.h" line="1009"/>
+        <source>All photos from the current selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/maintab.ui" line="1207"/>
+        <location filename="../build/ui_maintab.h" line="1010"/>
         <source>Extra data</source>
         <translation>Dodatkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="995"/>
-        <source>Additional data from dive computer</source>
-        <translation>Dodatkowe dane z komputera nurkowego</translation>
+        <location filename="../qt-ui/maintab.ui" line="1210"/>
+        <location filename="../build/ui_maintab.h" line="1011"/>
+        <source>Adittional data from the dive computer</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="81"/>
-        <location filename="../qt-ui/maintab.ui" line="485"/>
+        <location filename="../qt-ui/maintab.ui" line="92"/>
+        <location filename="../qt-ui/maintab.ui" line="676"/>
+        <location filename="../build/ui_maintab.h" line="947"/>
+        <location filename="../build/ui_maintab.h" line="967"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="88"/>
+        <location filename="../qt-ui/maintab.ui" line="102"/>
+        <location filename="../build/ui_maintab.h" line="948"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="452"/>
-        <source>Dive info</source>
-        <translation>Informacje</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/maintab.ui" line="504"/>
+        <location filename="../qt-ui/maintab.ui" line="695"/>
+        <location filename="../build/ui_maintab.h" line="969"/>
         <source>Interval</source>
         <translation>Przerwa powierzchniowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="561"/>
-        <location filename="../qt-ui/maintab.ui" line="826"/>
+        <location filename="../qt-ui/maintab.ui" line="752"/>
+        <location filename="../qt-ui/maintab.ui" line="1124"/>
+        <location filename="../build/ui_maintab.h" line="975"/>
+        <location filename="../build/ui_maintab.h" line="1003"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="637"/>
+        <location filename="../qt-ui/maintab.ui" line="828"/>
+        <location filename="../build/ui_maintab.h" line="983"/>
         <source>Avg. depth</source>
         <translation>Śr. głębokość </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="599"/>
+        <location filename="../qt-ui/maintab.ui" line="790"/>
+        <location filename="../build/ui_maintab.h" line="979"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="732"/>
+        <location filename="../qt-ui/maintab.ui" line="923"/>
+        <location filename="../build/ui_maintab.h" line="993"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="769"/>
+        <location filename="../qt-ui/maintab.ui" line="960"/>
+        <location filename="../build/ui_maintab.h" line="1006"/>
         <source>Stats</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="802"/>
+        <location filename="../qt-ui/maintab.ui" line="1016"/>
+        <location filename="../build/ui_maintab.h" line="996"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="814"/>
+        <location filename="../qt-ui/maintab.ui" line="1057"/>
+        <location filename="../build/ui_maintab.h" line="998"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="840"/>
+        <location filename="../qt-ui/maintab.ui" line="1028"/>
+        <location filename="../build/ui_maintab.h" line="997"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="891"/>
+        <location filename="../qt-ui/maintab.ui" line="1088"/>
+        <location filename="../build/ui_maintab.h" line="1001"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="975"/>
+        <location filename="../qt-ui/maintab.ui" line="1178"/>
+        <location filename="../build/ui_maintab.h" line="1008"/>
         <source>Photos</source>
         <translation>Zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="87"/>
+        <location filename="../qt-ui/maintab.cpp" line="107"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="91"/>
+        <location filename="../qt-ui/maintab.cpp" line="111"/>
         <source>Weights</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="46"/>
+        <location filename="../qt-ui/maintab.cpp" line="82"/>
         <source>Apply changes</source>
         <translation>Zastosuj zmiany</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="50"/>
+        <location filename="../qt-ui/maintab.cpp" line="86"/>
         <source>Discard changes</source>
         <translation>Porzuć zmiany</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="88"/>
+        <location filename="../qt-ui/maintab.cpp" line="108"/>
         <source>Add cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="92"/>
+        <location filename="../qt-ui/maintab.cpp" line="112"/>
         <source>Add weight system</source>
         <translation>Dodaj balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="277"/>
+        <location filename="../qt-ui/maintab.cpp" line="362"/>
         <source>Air temp. [%1]</source>
         <translation>Temp. powietrza [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="278"/>
+        <location filename="../qt-ui/maintab.cpp" line="363"/>
         <source>Water temp. [%1]</source>
         <translation>Temp. wody [%1]</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="315"/>
+        <location filename="../qt-ui/maintab.cpp" line="400"/>
         <source>This trip is being edited.</source>
         <translation>Ta grupa nurkowań jest obecnie edytowana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="323"/>
+        <location filename="../qt-ui/maintab.cpp" line="407"/>
         <source>Multiple dives are being edited.</source>
         <translation>Kilka nurkowań jest obecnie edytowanych.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="325"/>
+        <location filename="../qt-ui/maintab.cpp" line="409"/>
         <source>This dive is being edited.</source>
         <translation>To nurkowanie jest obecnie edytowane.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="440"/>
-        <location filename="../qt-ui/maintab.cpp" line="466"/>
+        <location filename="../qt-ui/maintab.cpp" line="587"/>
+        <location filename="../qt-ui/maintab.cpp" line="612"/>
         <source>Trip notes</source>
         <translation>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="464"/>
+        <location filename="../qt-ui/maintab.cpp" line="609"/>
         <source>Trip location</source>
         <translation>Miejsce nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="535"/>
-        <location filename="../qt-ui/maintab.cpp" line="567"/>
-        <location filename="../qt-ui/maintab.cpp" line="571"/>
-        <location filename="../qt-ui/maintab.cpp" line="575"/>
+        <location filename="../qt-ui/maintab.cpp" line="680"/>
+        <location filename="../qt-ui/maintab.cpp" line="712"/>
+        <location filename="../qt-ui/maintab.cpp" line="716"/>
+        <location filename="../qt-ui/maintab.cpp" line="720"/>
         <source>/min</source>
         <translation>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="564"/>
+        <location filename="../qt-ui/maintab.cpp" line="709"/>
         <source>Deepest dive</source>
         <translation>Najgłębsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="565"/>
+        <location filename="../qt-ui/maintab.cpp" line="710"/>
         <source>Shallowest dive</source>
         <translation>Najpłytsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="578"/>
+        <location filename="../qt-ui/maintab.cpp" line="723"/>
         <source>Highest total SAC of a dive</source>
         <translation>Najwyższy SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="579"/>
+        <location filename="../qt-ui/maintab.cpp" line="724"/>
         <source>Lowest total SAC of a dive</source>
         <translation>Najniższy SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="580"/>
+        <location filename="../qt-ui/maintab.cpp" line="725"/>
         <source>Average total SAC of all selected dives</source>
         <translation>Średni SAC z wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="591"/>
+        <location filename="../qt-ui/maintab.cpp" line="736"/>
         <source>Highest temperature</source>
         <translation>Najwyższa temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="592"/>
+        <location filename="../qt-ui/maintab.cpp" line="737"/>
         <source>Lowest temperature</source>
         <translation>Najniższa temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="593"/>
+        <location filename="../qt-ui/maintab.cpp" line="738"/>
         <source>Average temperature of all selected dives</source>
         <translation>Średnia temperatura z wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="603"/>
+        <location filename="../qt-ui/maintab.cpp" line="748"/>
         <source>Longest dive</source>
         <translation>Najdłuższe nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="604"/>
+        <location filename="../qt-ui/maintab.cpp" line="749"/>
         <source>Shortest dive</source>
         <translation>Najkrótsze nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="605"/>
+        <location filename="../qt-ui/maintab.cpp" line="750"/>
         <source>Average length of all selected dives</source>
         <translation>Średnia długość wybranych nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="629"/>
+        <location filename="../qt-ui/maintab.cpp" line="774"/>
         <source>These gases could be
 mixed from Air and using:
 </source>
@@ -3069,17 +4045,17 @@ z powietrza przy użyciu:
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="633"/>
+        <location filename="../qt-ui/maintab.cpp" line="778"/>
         <source> and </source>
         <translation>oraz </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="926"/>
+        <location filename="../qt-ui/maintab.cpp" line="1229"/>
         <source>Discard the changes?</source>
         <translation>Porzucić zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="927"/>
+        <location filename="../qt-ui/maintab.cpp" line="1230"/>
         <source>You are about to discard your changes.</source>
         <translation>Masz zamiar porzucić zmiany.</translation>
     </message>
@@ -3087,597 +4063,791 @@ z powietrza przy użyciu:
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="203"/>
+        <location filename="../qt-ui/mainwindow.ui" line="70"/>
+        <location filename="../build/ui_mainwindow.h" line="568"/>
         <source>&amp;File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="574"/>
+        <location filename="../qt-ui/mainwindow.ui" line="455"/>
+        <location filename="../build/ui_mainwindow.h" line="534"/>
         <source>Export dive logs</source>
         <translation>Eksport nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="629"/>
+        <location filename="../qt-ui/mainwindow.ui" line="510"/>
+        <location filename="../build/ui_mainwindow.h" line="542"/>
         <source>Toggle pHe graph</source>
         <translation>Pokazuj wykres pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="665"/>
+        <location filename="../qt-ui/mainwindow.ui" line="546"/>
+        <location filename="../build/ui_mainwindow.h" line="545"/>
         <source>Toggle calculating all tissues</source>
         <translation>Obliczenia dla wszystkich tkanek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="641"/>
+        <location filename="../qt-ui/mainwindow.ui" line="522"/>
+        <location filename="../build/ui_mainwindow.h" line="543"/>
         <source>Toggle DC reported ceiling</source>
         <translation>Pokazuj sufit z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="653"/>
+        <location filename="../qt-ui/mainwindow.ui" line="534"/>
+        <location filename="../build/ui_mainwindow.h" line="544"/>
         <source>Toggle calculated ceiling</source>
         <translation>Pokazuj obliczony sufit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="725"/>
+        <location filename="../qt-ui/mainwindow.ui" line="606"/>
+        <location filename="../build/ui_mainwindow.h" line="550"/>
         <source>Toggle NDL, TTS</source>
         <translation>Pokazuj NDL / TTS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../qt-ui/mainwindow.ui" line="558"/>
+        <location filename="../build/ui_mainwindow.h" line="546"/>
         <source>Toggle calculated ceiling with 3m increments</source>
         <translation>Pokazuj obliczony sufit z krokiem 3m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="582"/>
+        <location filename="../qt-ui/mainwindow.ui" line="463"/>
+        <location filename="../build/ui_mainwindow.h" line="537"/>
         <source>Configure &amp;dive computer</source>
         <translation>Konfiguruj komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="593"/>
-        <source>Re-plan &amp;dive</source>
-        <translation>Zaplanuj nurkowanie ponownie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <location filename="../qt-ui/mainwindow.ui" line="570"/>
+        <location filename="../build/ui_mainwindow.h" line="547"/>
         <source>Toggle heart rate</source>
         <translation>Pokazuj tętno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="701"/>
+        <location filename="../qt-ui/mainwindow.ui" line="582"/>
+        <location filename="../build/ui_mainwindow.h" line="548"/>
         <source>Toggle MOD</source>
         <translation>Pokazuj MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="713"/>
+        <location filename="../qt-ui/mainwindow.ui" line="594"/>
+        <location filename="../build/ui_mainwindow.h" line="549"/>
         <source>Toggle EAD, END, EADD</source>
         <translation>Pokazuj EAD, END, EADD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="737"/>
+        <location filename="../qt-ui/mainwindow.ui" line="618"/>
+        <location filename="../build/ui_mainwindow.h" line="551"/>
         <source>Toggle SAC rate</source>
         <translation>Pokazuj SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="749"/>
+        <location filename="../qt-ui/mainwindow.ui" line="630"/>
+        <location filename="../build/ui_mainwindow.h" line="552"/>
         <source>Toggle ruler</source>
         <translation>Pokazuj linijkę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="124"/>
-        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Plan nurkowy&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="140"/>
-        <source>Print</source>
-        <translation>Drukuj</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="173"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Courier&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="226"/>
+        <location filename="../qt-ui/mainwindow.ui" line="95"/>
+        <location filename="../build/ui_mainwindow.h" line="569"/>
         <source>&amp;Log</source>
         <translation>Log</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="242"/>
+        <location filename="../qt-ui/mainwindow.ui" line="112"/>
+        <location filename="../build/ui_mainwindow.h" line="570"/>
         <source>&amp;View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="258"/>
+        <location filename="../qt-ui/mainwindow.ui" line="128"/>
+        <location filename="../build/ui_mainwindow.h" line="571"/>
         <source>&amp;Help</source>
         <translation>Pomoc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../qt-ui/mainwindow.ui" line="137"/>
+        <location filename="../build/ui_mainwindow.h" line="572"/>
         <source>&amp;Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="282"/>
+        <location filename="../qt-ui/mainwindow.ui" line="146"/>
+        <location filename="../build/ui_mainwindow.h" line="573"/>
+        <source>&amp;Edit</source>
+        <translation>Edytuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="158"/>
+        <location filename="../build/ui_mainwindow.h" line="453"/>
         <source>&amp;New logbook</source>
         <translation>Nowy logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="285"/>
+        <location filename="../qt-ui/mainwindow.ui" line="161"/>
+        <location filename="../build/ui_mainwindow.h" line="455"/>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../qt-ui/mainwindow.ui" line="164"/>
+        <location filename="../build/ui_mainwindow.h" line="457"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../qt-ui/mainwindow.ui" line="169"/>
+        <location filename="../build/ui_mainwindow.h" line="458"/>
         <source>&amp;Open logbook</source>
         <translation>Otwórz logbook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="296"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="233"/>
+        <location filename="../qt-ui/mainwindow.ui" line="172"/>
+        <location filename="../build/ui_mainwindow.h" line="460"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="339"/>
         <source>Open</source>
         <translation>Otwórz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="299"/>
+        <location filename="../qt-ui/mainwindow.ui" line="175"/>
+        <location filename="../build/ui_mainwindow.h" line="462"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="304"/>
+        <location filename="../qt-ui/mainwindow.ui" line="180"/>
+        <location filename="../build/ui_mainwindow.h" line="463"/>
         <source>&amp;Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="307"/>
+        <location filename="../qt-ui/mainwindow.ui" line="183"/>
+        <location filename="../build/ui_mainwindow.h" line="465"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="310"/>
+        <location filename="../qt-ui/mainwindow.ui" line="186"/>
+        <location filename="../build/ui_mainwindow.h" line="467"/>
         <source>Ctrl+S</source>
         <translation>Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="315"/>
+        <location filename="../qt-ui/mainwindow.ui" line="191"/>
+        <location filename="../build/ui_mainwindow.h" line="468"/>
         <source>Sa&amp;ve as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="318"/>
+        <location filename="../qt-ui/mainwindow.ui" line="194"/>
+        <location filename="../build/ui_mainwindow.h" line="470"/>
         <source>Save as</source>
         <translation>Zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="321"/>
+        <location filename="../qt-ui/mainwindow.ui" line="197"/>
+        <location filename="../build/ui_mainwindow.h" line="472"/>
         <source>Ctrl+Shift+S</source>
         <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="326"/>
+        <location filename="../qt-ui/mainwindow.ui" line="202"/>
+        <location filename="../build/ui_mainwindow.h" line="473"/>
         <source>&amp;Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="329"/>
+        <location filename="../qt-ui/mainwindow.ui" line="205"/>
+        <location filename="../build/ui_mainwindow.h" line="475"/>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="332"/>
+        <location filename="../qt-ui/mainwindow.ui" line="208"/>
+        <location filename="../build/ui_mainwindow.h" line="477"/>
         <source>Ctrl+W</source>
         <translation>Ctrl+W</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="345"/>
+        <location filename="../qt-ui/mainwindow.ui" line="221"/>
+        <location filename="../build/ui_mainwindow.h" line="480"/>
         <source>P&amp;references</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="375"/>
+        <location filename="../qt-ui/mainwindow.ui" line="251"/>
+        <location filename="../build/ui_mainwindow.h" line="486"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
         <translation>Importuj dane GPS z usługi sieciowej Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="396"/>
+        <location filename="../qt-ui/mainwindow.ui" line="259"/>
+        <location filename="../build/ui_mainwindow.h" line="488"/>
+        <source>Edit device &amp;names</source>
+        <translation>Edycja nazw komputerów nurkowych</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="272"/>
+        <location filename="../build/ui_mainwindow.h" line="491"/>
+        <source>&amp;Edit dive</source>
+        <translation>Edytuj nurkowanie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="277"/>
+        <location filename="../build/ui_mainwindow.h" line="492"/>
         <source>&amp;Copy dive components</source>
         <translation>Kopiuj parametry nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="399"/>
+        <location filename="../qt-ui/mainwindow.ui" line="280"/>
+        <location filename="../build/ui_mainwindow.h" line="493"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="404"/>
+        <location filename="../qt-ui/mainwindow.ui" line="285"/>
+        <location filename="../build/ui_mainwindow.h" line="494"/>
         <source>&amp;Paste dive components</source>
         <translation>Wklej parametry nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="407"/>
+        <location filename="../qt-ui/mainwindow.ui" line="288"/>
+        <location filename="../build/ui_mainwindow.h" line="495"/>
         <source>Ctrl+V</source>
         <translation>Ctrl+V</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="444"/>
+        <location filename="../qt-ui/mainwindow.ui" line="325"/>
+        <location filename="../build/ui_mainwindow.h" line="503"/>
         <source>&amp;Profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../qt-ui/mainwindow.ui" line="333"/>
+        <location filename="../build/ui_mainwindow.h" line="505"/>
         <source>&amp;Info</source>
         <translation>Info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="460"/>
+        <location filename="../qt-ui/mainwindow.ui" line="341"/>
+        <location filename="../build/ui_mainwindow.h" line="507"/>
         <source>&amp;All</source>
         <translation>Wszystko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="476"/>
+        <location filename="../qt-ui/mainwindow.ui" line="357"/>
+        <location filename="../build/ui_mainwindow.h" line="511"/>
         <source>&amp;Next DC</source>
         <translation>Następny komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="484"/>
+        <location filename="../qt-ui/mainwindow.ui" line="365"/>
+        <location filename="../build/ui_mainwindow.h" line="513"/>
         <source>&amp;About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="500"/>
+        <location filename="../qt-ui/mainwindow.ui" line="381"/>
+        <location filename="../build/ui_mainwindow.h" line="516"/>
         <source>&amp;Globe</source>
         <translation>Mapa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="522"/>
+        <location filename="../qt-ui/mainwindow.ui" line="403"/>
+        <location filename="../build/ui_mainwindow.h" line="524"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="527"/>
+        <location filename="../qt-ui/mainwindow.ui" line="408"/>
+        <location filename="../build/ui_mainwindow.h" line="525"/>
         <source>Import &amp;from divelogs.de</source>
         <translation>Importuj z divelogs.de</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="535"/>
+        <location filename="../qt-ui/mainwindow.ui" line="416"/>
+        <location filename="../build/ui_mainwindow.h" line="526"/>
         <source>&amp;Full screen</source>
         <translation>Pełen ekran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="538"/>
+        <location filename="../qt-ui/mainwindow.ui" line="419"/>
+        <location filename="../build/ui_mainwindow.h" line="528"/>
         <source>Toggle full screen</source>
         <translation>Przełącz pełen ekran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="566"/>
+        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../build/ui_mainwindow.h" line="531"/>
         <source>&amp;Check for updates</source>
         <translation>Sprawdź aktualizacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="571"/>
+        <location filename="../qt-ui/mainwindow.ui" line="452"/>
+        <location filename="../build/ui_mainwindow.h" line="532"/>
         <source>&amp;Export</source>
         <translation>Eksport</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="577"/>
+        <location filename="../qt-ui/mainwindow.ui" line="458"/>
+        <location filename="../build/ui_mainwindow.h" line="536"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="585"/>
+        <location filename="../qt-ui/mainwindow.ui" line="466"/>
+        <location filename="../build/ui_mainwindow.h" line="538"/>
         <source>Ctrl+Shift+C</source>
         <translation>Ctrl+Shift+C</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="605"/>
+        <location filename="../qt-ui/mainwindow.ui" line="474"/>
+        <location filename="../build/ui_mainwindow.h" line="539"/>
+        <source>Edit &amp;dive in planner</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="486"/>
+        <location filename="../build/ui_mainwindow.h" line="540"/>
         <source>Toggle pO₂ graph</source>
         <translation>Pokazuj wykres pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="617"/>
+        <location filename="../qt-ui/mainwindow.ui" line="498"/>
+        <location filename="../build/ui_mainwindow.h" line="541"/>
         <source>Toggle pN₂ graph</source>
         <translation>Pokazuj wykres pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="761"/>
+        <location filename="../qt-ui/mainwindow.ui" line="642"/>
+        <location filename="../build/ui_mainwindow.h" line="553"/>
         <source>Scale graph</source>
         <translation>Skalowanie wykresu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="773"/>
+        <location filename="../qt-ui/mainwindow.ui" line="654"/>
+        <location filename="../build/ui_mainwindow.h" line="554"/>
         <source>Toggle pictures</source>
         <translation>Pokazuj zdjęcia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="785"/>
+        <location filename="../qt-ui/mainwindow.ui" line="666"/>
+        <location filename="../build/ui_mainwindow.h" line="555"/>
         <source>Toggle tank bar</source>
         <translation>Pokazuj pasek gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="793"/>
+        <location filename="../qt-ui/mainwindow.ui" line="674"/>
+        <location filename="../build/ui_mainwindow.h" line="556"/>
         <source>&amp;Filter divelist</source>
         <translation>Filtrowanie nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="808"/>
+        <location filename="../qt-ui/mainwindow.ui" line="689"/>
+        <location filename="../build/ui_mainwindow.h" line="558"/>
         <source>Toggle tissue graph</source>
         <translation>Pokazuj nasycenie tkanek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="813"/>
+        <location filename="../qt-ui/mainwindow.ui" line="694"/>
+        <location filename="../build/ui_mainwindow.h" line="559"/>
         <source>User &amp;survey</source>
         <translation>Ankieta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="796"/>
+        <location filename="../qt-ui/mainwindow.ui" line="699"/>
+        <location filename="../build/ui_mainwindow.h" line="560"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="213"/>
+        <source>&amp;Undo</source>
+        <translation>Cofnij</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/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="707"/>
+        <location filename="../build/ui_mainwindow.h" line="562"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="214"/>
+        <source>&amp;Redo</source>
+        <translation>Ponów</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/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="715"/>
+        <location filename="../build/ui_mainwindow.h" line="564"/>
+        <source>&amp;Find moved images</source>
+        <translation>Znajdź przeniesione zdjecia</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="720"/>
+        <source>Open c&amp;loud storage</source>
+        <translation>Otwórz dane z chmury</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="725"/>
+        <source>Save to clo&amp;ud storage</source>
+        <translation>Zapisz do chmury</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="730"/>
+        <location filename="../build/ui_mainwindow.h" line="567"/>
+        <source>&amp;Manage dive sites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="735"/>
+        <source>Dive Site &amp;Edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.ui" line="677"/>
+        <location filename="../build/ui_mainwindow.h" line="557"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="337"/>
+        <location filename="../qt-ui/mainwindow.ui" line="213"/>
+        <location filename="../build/ui_mainwindow.h" line="478"/>
         <source>&amp;Print</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="348"/>
+        <location filename="../qt-ui/mainwindow.ui" line="224"/>
+        <location filename="../build/ui_mainwindow.h" line="481"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="356"/>
+        <location filename="../qt-ui/mainwindow.ui" line="232"/>
+        <location filename="../build/ui_mainwindow.h" line="482"/>
         <source>&amp;Quit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="367"/>
+        <location filename="../qt-ui/mainwindow.ui" line="243"/>
+        <location filename="../build/ui_mainwindow.h" line="484"/>
         <source>Import from &amp;dive computer</source>
         <translation>Importuj z komputera nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="378"/>
+        <location filename="../qt-ui/mainwindow.ui" line="254"/>
+        <location filename="../build/ui_mainwindow.h" line="487"/>
         <source>Ctrl+G</source>
         <translation>Ctrl+G</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="391"/>
+        <location filename="../qt-ui/mainwindow.ui" line="267"/>
+        <location filename="../build/ui_mainwindow.h" line="490"/>
         <source>Ctrl++</source>
         <translation>Ctrl++</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="412"/>
+        <location filename="../qt-ui/mainwindow.ui" line="293"/>
+        <location filename="../build/ui_mainwindow.h" line="496"/>
         <source>&amp;Renumber</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="415"/>
+        <location filename="../qt-ui/mainwindow.ui" line="296"/>
+        <location filename="../build/ui_mainwindow.h" line="497"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="431"/>
+        <location filename="../qt-ui/mainwindow.ui" line="312"/>
+        <location filename="../build/ui_mainwindow.h" line="500"/>
         <source>Ctrl+Y</source>
         <translation>Ctrl+Y</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="511"/>
+        <location filename="../qt-ui/mainwindow.ui" line="392"/>
+        <location filename="../build/ui_mainwindow.h" line="519"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="340"/>
+        <location filename="../qt-ui/mainwindow.ui" line="216"/>
+        <location filename="../build/ui_mainwindow.h" line="479"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="359"/>
+        <location filename="../qt-ui/mainwindow.ui" line="235"/>
+        <location filename="../build/ui_mainwindow.h" line="483"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="370"/>
+        <location filename="../qt-ui/mainwindow.ui" line="246"/>
+        <location filename="../build/ui_mainwindow.h" line="485"/>
         <source>Ctrl+D</source>
         <translation>Ctrl+D</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="383"/>
-        <source>&amp;Edit device names</source>
-        <translation>Edycja nazw komputerów nurkowych</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.ui" line="388"/>
+        <location filename="../qt-ui/mainwindow.ui" line="264"/>
+        <location filename="../build/ui_mainwindow.h" line="489"/>
         <source>&amp;Add dive</source>
         <translation>Dodaj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="423"/>
+        <location filename="../qt-ui/mainwindow.ui" line="304"/>
+        <location filename="../build/ui_mainwindow.h" line="498"/>
         <source>Auto &amp;group</source>
         <translation>Automatycznie grupuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="428"/>
+        <location filename="../qt-ui/mainwindow.ui" line="309"/>
+        <location filename="../build/ui_mainwindow.h" line="499"/>
         <source>&amp;Yearly statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="436"/>
+        <location filename="../qt-ui/mainwindow.ui" line="317"/>
+        <location filename="../build/ui_mainwindow.h" line="501"/>
         <source>&amp;Dive list</source>
         <translation>Lista nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="439"/>
+        <location filename="../qt-ui/mainwindow.ui" line="320"/>
+        <location filename="../build/ui_mainwindow.h" line="502"/>
         <source>Ctrl+2</source>
         <translation>Ctrl+2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="447"/>
+        <location filename="../qt-ui/mainwindow.ui" line="328"/>
+        <location filename="../build/ui_mainwindow.h" line="504"/>
         <source>Ctrl+3</source>
         <translation>Ctrl+3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="455"/>
+        <location filename="../qt-ui/mainwindow.ui" line="336"/>
+        <location filename="../build/ui_mainwindow.h" line="506"/>
         <source>Ctrl+4</source>
         <translation>Ctrl+4</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="463"/>
+        <location filename="../qt-ui/mainwindow.ui" line="344"/>
+        <location filename="../build/ui_mainwindow.h" line="508"/>
         <source>Ctrl+1</source>
         <translation>Ctrl+1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="468"/>
+        <location filename="../qt-ui/mainwindow.ui" line="349"/>
+        <location filename="../build/ui_mainwindow.h" line="509"/>
         <source>P&amp;revious DC</source>
         <translation>Poprzedni komputer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="471"/>
+        <location filename="../qt-ui/mainwindow.ui" line="352"/>
+        <location filename="../build/ui_mainwindow.h" line="510"/>
         <source>Left</source>
         <translation>W lewo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="479"/>
+        <location filename="../qt-ui/mainwindow.ui" line="360"/>
+        <location filename="../build/ui_mainwindow.h" line="512"/>
         <source>Right</source>
         <translation>W prawo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="492"/>
+        <location filename="../qt-ui/mainwindow.ui" line="373"/>
+        <location filename="../build/ui_mainwindow.h" line="514"/>
         <source>User &amp;manual</source>
         <translation>Instrukcja obsługi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="495"/>
+        <location filename="../qt-ui/mainwindow.ui" line="376"/>
+        <location filename="../build/ui_mainwindow.h" line="515"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="503"/>
+        <location filename="../qt-ui/mainwindow.ui" line="384"/>
+        <location filename="../build/ui_mainwindow.h" line="517"/>
         <source>Ctrl+5</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="508"/>
+        <location filename="../qt-ui/mainwindow.ui" line="389"/>
+        <location filename="../build/ui_mainwindow.h" line="518"/>
         <source>P&amp;lan dive</source>
         <translation>Zaplanuj nurkowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="516"/>
+        <location filename="../qt-ui/mainwindow.ui" line="397"/>
+        <location filename="../build/ui_mainwindow.h" line="520"/>
         <source>&amp;Import log files</source>
         <translation>Importowanie logów nurkowych</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="519"/>
+        <location filename="../qt-ui/mainwindow.ui" line="400"/>
+        <location filename="../build/ui_mainwindow.h" line="522"/>
         <source>Import divelog files from other applications</source>
         <translation>Importuj logi z innej aplikacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.ui" line="541"/>
+        <location filename="../qt-ui/mainwindow.ui" line="422"/>
+        <location filename="../build/ui_mainwindow.h" line="530"/>
         <source>F11</source>
         <translation>F11</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="230"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="336"/>
         <source>Open file</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="234"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="340"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="445"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="308"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="441"/>
+        <source>Traverse image directories</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="444"/>
+        <source>Scan</source>
+        <translation>Skanuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="452"/>
+        <source>Scanning images...(this can take a while)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="505"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
         <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="420"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="622"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
         <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="467"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="669"/>
         <source>Print runtime table</source>
         <translation>Drukowanie planu nurkowego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="810"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="774"/>
+        <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1032"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="812"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1035"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Czy chcesz zapisać wprowadzone zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="817"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1040"/>
         <source>Save changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1172"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1395"/>
         <source>Save file as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1313"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1473"/>
+        <source>[cloud storage for] %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1570"/>
+        <source>Opening datafile from older version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1571"/>
+        <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
+Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1582"/>
         <source>Open dive log file</source>
         <translation>Otwórz plik z logiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="818"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1583"/>
+        <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;All files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="1041"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="278"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="420"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1354"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="480"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="622"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="768"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="774"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1628"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="224"/>
-        <location filename="../qt-ui/mainwindow.cpp" line="1156"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="330"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="375"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1377"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="601"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="697"/>
+        <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="821"/>
         <source>Yearly statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1173"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1396"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1314"/>
-        <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files (*.sde *.db);;Divesoft files (*.dlf);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files (*)</source>
-        <translation>Logi nurkowe (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf);;Pliki Cochran (*.can);;Pliki CSV (*.csv);;Pliki DiveLog.de (*.dld);;Pliki JDiveLog (*.jlb);;Pliki Liquivision (*.lvd);;Pliki MkVI (*.txt);;Pliki Suunto (*.sde *.db);;Pliki Divesoft (*.dlf);;Pliki UDDF/UDCF (*.uddf *.udcf);;Pliki XML (*.xml);;Wszystkie pliki (*)</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="1354"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="768"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="1628"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation>
     </message>
+    <message>
+        <location filename="../build/ui_mainwindow.h" line="565"/>
+        <source>Open cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../build/ui_mainwindow.h" line="566"/>
+        <source>Save to cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>MultiFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="634"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="707"/>
         <source>Filter shows %1 (of %2) dives</source>
         <translation>Filtr pokazuje %1 (z %2) nurkowań</translation>
     </message>
@@ -3685,12 +4855,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>OstcFirmwareCheck</name>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="239"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
         <translation>Możesz zaktualizować oprogramowanie w swoim komputerze nurkowym: masz wersję %1 a najnowsza stabilna wersja to %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="243"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="248"/>
         <source>
 
 Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -3699,27 +4869,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
 Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wykonaj na komputerze nurkowym te same kroki co przy przygotowywaniu się do zgrania danych z logbooka.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="244"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="249"/>
         <source>Not now</source>
         <translation>Nie teraz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="245"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="250"/>
         <source>Update firmware</source>
         <translation>Aktualizuj oprogramowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="247"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="252"/>
         <source>Firmware upgrade notice</source>
         <translation>Informacja o aktualizacji oprogramowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="265"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="270"/>
         <source>Save the downloaded firmware as</source>
         <translation>Zapisz pobrany firmware jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="266"/>
+        <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="271"/>
         <source>HEX files (*.hex)</source>
         <translation>Pliki HEX (*.hex)</translation>
     </message>
@@ -3727,69 +4897,69 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PlannerSettingsWidget</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="319"/>
         <source>Open circuit</source>
         <translation>Obieg otwarty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="319"/>
         <source>CCR</source>
         <translation>CCR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="409"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="319"/>
         <source>pSCR</source>
         <translation>pSCR</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="480"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="418"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="481"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="419"/>
         <source>Last stop at 20ft</source>
         <translation>Ostatni przystanek na gł. 20 stóp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="482"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="420"/>
         <source>50% avg. depth to 20ft</source>
         <translation>50% śr. głębokości do 20ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="483"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="421"/>
         <source>20ft to surface</source>
         <translation>20ft do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="485"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="423"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="486"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="424"/>
         <source>Last stop at 6m</source>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="487"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="425"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% śr. głębokości do 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="488"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="426"/>
         <source>6m to surface</source>
         <translation>6m do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="491"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="492"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="429"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="430"/>
         <source>cuft/min</source>
         <translation>cuft/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="500"/>
-        <location filename="../qt-ui/diveplanner.cpp" line="501"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="438"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="439"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
@@ -3797,443 +4967,680 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PreferencesDialog</name>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="85"/>
+        <location filename="../qt-ui/preferences.ui" line="97"/>
+        <location filename="../build/ui_preferences.h" line="1288"/>
         <source>Defaults</source>
         <translation>Ogólne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="95"/>
+        <location filename="../qt-ui/preferences.ui" line="107"/>
+        <location filename="../build/ui_preferences.h" line="1290"/>
         <source>Units</source>
         <translation>Jednostki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="105"/>
+        <location filename="../qt-ui/preferences.ui" line="117"/>
+        <location filename="../build/ui_preferences.h" line="1292"/>
         <source>Graph</source>
         <translation>Wykres</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <location filename="../qt-ui/preferences.ui" line="127"/>
+        <location filename="../build/ui_preferences.h" line="1294"/>
         <source>Language</source>
         <translation>Język</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="125"/>
+        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../build/ui_preferences.h" line="1296"/>
         <source>Network</source>
         <translation>Sieć</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="135"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../build/ui_preferences.h" line="1298"/>
         <source>Facebook</source>
         <translation>Facebook</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="167"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
+        <location filename="../build/ui_preferences.h" line="1300"/>
+        <source>Georeference</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="217"/>
+        <location filename="../build/ui_preferences.h" line="1304"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="177"/>
+        <location filename="../qt-ui/preferences.ui" line="227"/>
+        <location filename="../build/ui_preferences.h" line="1305"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="190"/>
+        <location filename="../qt-ui/preferences.ui" line="240"/>
+        <location filename="../build/ui_preferences.h" line="1306"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="208"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../build/ui_preferences.h" line="1308"/>
+        <source>No default file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
+        <location filename="../build/ui_preferences.h" line="1309"/>
+        <source>&amp;Local default file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="293"/>
+        <location filename="../build/ui_preferences.h" line="1310"/>
+        <source>Clo&amp;ud storage default file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="305"/>
+        <location filename="../build/ui_preferences.h" line="1311"/>
+        <source>Local dive log file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="317"/>
+        <location filename="../build/ui_preferences.h" line="1312"/>
         <source>Use default</source>
         <translation>Używaj domyślnego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="218"/>
+        <location filename="../qt-ui/preferences.ui" line="327"/>
+        <location filename="../build/ui_preferences.h" line="1313"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="267"/>
+        <location filename="../qt-ui/preferences.ui" line="394"/>
+        <location filename="../build/ui_preferences.h" line="1318"/>
         <source>Animations</source>
         <translation>Animacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="412"/>
+        <location filename="../build/ui_preferences.h" line="1319"/>
         <source>Speed</source>
         <translation>Prędkość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="326"/>
+        <location filename="../qt-ui/preferences.ui" line="439"/>
+        <location filename="../build/ui_preferences.h" line="1320"/>
         <source>Clear all settings</source>
         <translation>Kasowanie ustawień</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="332"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../build/ui_preferences.h" line="1321"/>
         <source>Reset all settings to their default value</source>
         <translation>Przywróć wszystkie ustawienia do ich wartości domyślnych </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <location filename="../qt-ui/preferences.ui" line="508"/>
+        <location filename="../build/ui_preferences.h" line="1322"/>
+        <source>Unit system</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="514"/>
+        <location filename="../build/ui_preferences.h" line="1323"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>Metric</source>
-        <translation>Metryczny</translation>
+        <location filename="../qt-ui/preferences.ui" line="1572"/>
+        <location filename="../build/ui_preferences.h" line="1401"/>
+        <source>Dive site geo lookup</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Imperial</source>
-        <translation>Imperialny</translation>
+        <location filename="../qt-ui/preferences.ui" line="1578"/>
+        <location filename="../build/ui_preferences.h" line="1402"/>
+        <source>Enable geocoding for dive site management</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="388"/>
-        <source>Personalize</source>
-        <translation>Dostosuj</translation>
+        <location filename="../qt-ui/preferences.ui" line="1585"/>
+        <location filename="../build/ui_preferences.h" line="1403"/>
+        <source>Parse site without GPS data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
+        <location filename="../qt-ui/preferences.ui" line="1592"/>
+        <location filename="../build/ui_preferences.h" line="1404"/>
+        <source>Same format for existing dives</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1602"/>
+        <location filename="../build/ui_preferences.h" line="1405"/>
+        <source>Dive Site Layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1624"/>
+        <location filename="../qt-ui/preferences.ui" line="1641"/>
+        <location filename="../build/ui_preferences.h" line="1406"/>
+        <location filename="../build/ui_preferences.h" line="1407"/>
+        <source>/</source>
+        <translation>/</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="531"/>
+        <location filename="../build/ui_preferences.h" line="1325"/>
+        <source>Imperial</source>
+        <translation>Imperialny</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="566"/>
+        <location filename="../build/ui_preferences.h" line="1328"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="419"/>
+        <location filename="../qt-ui/preferences.ui" line="573"/>
+        <location filename="../build/ui_preferences.h" line="1329"/>
         <source>meter</source>
         <translation>metry</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="429"/>
+        <location filename="../qt-ui/preferences.ui" line="583"/>
+        <location filename="../build/ui_preferences.h" line="1330"/>
         <source>feet</source>
         <translation>stopy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="446"/>
-        <location filename="../qt-ui/preferences.ui" line="816"/>
+        <location filename="../qt-ui/preferences.ui" line="600"/>
+        <location filename="../qt-ui/preferences.ui" line="1027"/>
+        <location filename="../build/ui_preferences.h" line="1332"/>
+        <location filename="../build/ui_preferences.h" line="1366"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="456"/>
+        <location filename="../qt-ui/preferences.ui" line="610"/>
+        <location filename="../build/ui_preferences.h" line="1333"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="473"/>
-        <source>liter</source>
-        <translation>litry</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="483"/>
+        <location filename="../qt-ui/preferences.ui" line="637"/>
+        <location filename="../build/ui_preferences.h" line="1336"/>
         <source>cu ft</source>
         <translation>stopy sześcienne (cu ft)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
+        <location filename="../qt-ui/preferences.ui" line="654"/>
+        <location filename="../build/ui_preferences.h" line="1338"/>
         <source>celsius</source>
         <translation>stopnie Celsjusza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <location filename="../qt-ui/preferences.ui" line="664"/>
+        <location filename="../build/ui_preferences.h" line="1339"/>
         <source>fahrenheit</source>
         <translation>stopnie Fahrenheita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="527"/>
+        <location filename="../qt-ui/preferences.ui" line="681"/>
+        <location filename="../build/ui_preferences.h" line="1341"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="795"/>
+        <location filename="../qt-ui/preferences.ui" line="1006"/>
+        <location filename="../build/ui_preferences.h" line="1363"/>
         <source>CCR: show setpoints when viewing pO₂</source>
         <translation>CCR: pokazuj setpointy przy wyświetlaniu pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="802"/>
+        <location filename="../qt-ui/preferences.ui" line="1013"/>
+        <location filename="../build/ui_preferences.h" line="1364"/>
         <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
         <translation>CCR: pokazuj odczyty poszczególnych sensorów O₂ przy wyświetlaniu pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="809"/>
+        <location filename="../qt-ui/preferences.ui" line="1020"/>
+        <location filename="../build/ui_preferences.h" line="1365"/>
         <source>Default CCR set-point for dive planning</source>
         <translation>Domyślny setpoint CCR dla planowania nurkowań </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="832"/>
+        <location filename="../qt-ui/preferences.ui" line="1043"/>
+        <location filename="../build/ui_preferences.h" line="1367"/>
         <source>pSCR O₂ metabolism rate</source>
         <translation>pSCR tempo metabolizmu O₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="839"/>
+        <location filename="../qt-ui/preferences.ui" line="1050"/>
+        <location filename="../build/ui_preferences.h" line="1368"/>
         <source>pSCR ratio</source>
         <translation>pSCR współczynnik wymiany</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="846"/>
+        <location filename="../qt-ui/preferences.ui" line="1057"/>
+        <location filename="../build/ui_preferences.h" line="1369"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="859"/>
+        <location filename="../qt-ui/preferences.ui" line="1070"/>
+        <location filename="../build/ui_preferences.h" line="1371"/>
         <source>1:</source>
         <translation>1:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="875"/>
+        <location filename="../qt-ui/preferences.ui" line="1127"/>
+        <location filename="../build/ui_preferences.h" line="1372"/>
+        <source>UI language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1133"/>
+        <location filename="../build/ui_preferences.h" line="1373"/>
         <source>System default</source>
         <translation>Domyślne ustawienia systemu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="914"/>
+        <location filename="../qt-ui/preferences.ui" line="1214"/>
+        <location filename="../build/ui_preferences.h" line="1375"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="920"/>
+        <location filename="../qt-ui/preferences.ui" line="1253"/>
+        <location filename="../build/ui_preferences.h" line="1379"/>
         <source>Proxy type</source>
         <translation>Rodzaj proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="933"/>
+        <location filename="../qt-ui/preferences.ui" line="1236"/>
+        <location filename="../build/ui_preferences.h" line="1377"/>
         <source>Host</source>
         <translation>Host</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="959"/>
+        <location filename="../qt-ui/preferences.ui" line="1226"/>
+        <location filename="../build/ui_preferences.h" line="1376"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="985"/>
+        <location filename="../qt-ui/preferences.ui" line="1246"/>
+        <location filename="../build/ui_preferences.h" line="1378"/>
         <source>Requires authentication</source>
         <translation>Wymaga autentykacji</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1005"/>
+        <location filename="../qt-ui/preferences.ui" line="1263"/>
+        <location filename="../build/ui_preferences.h" line="1380"/>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1028"/>
+        <location filename="../qt-ui/preferences.ui" line="1312"/>
+        <location filename="../qt-ui/preferences.ui" line="1366"/>
+        <location filename="../build/ui_preferences.h" line="1381"/>
+        <location filename="../build/ui_preferences.h" line="1387"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="1071"/>
+        <location filename="../qt-ui/preferences.ui" line="1526"/>
+        <location filename="../build/ui_preferences.h" line="1400"/>
         <source>Disconnect from Facebook</source>
         <translation>Rozłącz z Facebookiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="895"/>
+        <location filename="../qt-ui/preferences.ui" line="1153"/>
+        <location filename="../build/ui_preferences.h" line="1374"/>
         <source>Filter</source>
         <translation>Filtr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="439"/>
+        <location filename="../qt-ui/preferences.ui" line="593"/>
+        <location filename="../build/ui_preferences.h" line="1331"/>
         <source>Pressure</source>
         <translation>Ciśnienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="161"/>
+        <location filename="../qt-ui/preferences.ui" line="199"/>
+        <location filename="../build/ui_preferences.h" line="1303"/>
         <source>Lists and tables</source>
         <translation>Listy i tabele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="196"/>
+        <location filename="../qt-ui/preferences.ui" line="264"/>
+        <location filename="../build/ui_preferences.h" line="1307"/>
         <source>Default dive log file</source>
         <translation>Domyślny plik nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="227"/>
+        <location filename="../qt-ui/preferences.ui" line="336"/>
+        <location filename="../build/ui_preferences.h" line="1314"/>
         <source>Display invalid</source>
         <translation>Pokazuj niepoprawne nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="244"/>
+        <location filename="../qt-ui/preferences.ui" line="353"/>
+        <location filename="../build/ui_preferences.h" line="1316"/>
         <source>Default cylinder</source>
         <translation>Domyślna butla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="250"/>
+        <location filename="../qt-ui/preferences.ui" line="377"/>
+        <location filename="../build/ui_preferences.h" line="1317"/>
         <source>Use default cylinder</source>
         <translation>Użyj domyślnej butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="300"/>
+        <location filename="../qt-ui/preferences.ui" line="1350"/>
+        <location filename="../build/ui_preferences.h" line="1382"/>
+        <location filename="../qt-ui/preferences.cpp" line="123"/>
+        <source>Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1359"/>
+        <location filename="../build/ui_preferences.h" line="1386"/>
+        <source>Email address</source>
+        <translation>adres email</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1373"/>
+        <location filename="../build/ui_preferences.h" line="1388"/>
+        <source>Verification PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1380"/>
+        <source>New password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1408"/>
+        <location filename="../build/ui_preferences.h" line="1395"/>
+        <source>Sync to cloud in the background?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1415"/>
+        <location filename="../build/ui_preferences.h" line="1396"/>
+        <source>Save Password locally?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="1425"/>
+        <location filename="../build/ui_preferences.h" line="1397"/>
         <source>Subsurface web service</source>
         <translation>Usługa Internetowa Subsurface</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="306"/>
+        <location filename="../qt-ui/preferences.ui" line="1446"/>
+        <location filename="../build/ui_preferences.h" line="1398"/>
         <source>Default user ID</source>
         <translation>Domyślne ID Użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="316"/>
+        <location filename="../qt-ui/preferences.ui" line="1456"/>
+        <location filename="../build/ui_preferences.h" line="1399"/>
         <source>Save user ID locally?</source>
         <translation>Zapisywać ID użytkownika do pliku?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="466"/>
+        <location filename="../qt-ui/preferences.ui" line="620"/>
+        <location filename="../build/ui_preferences.h" line="1334"/>
         <source>Volume</source>
         <translation>Objętość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="493"/>
+        <location filename="../qt-ui/preferences.ui" line="647"/>
+        <location filename="../build/ui_preferences.h" line="1337"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="520"/>
+        <location filename="../qt-ui/preferences.ui" line="674"/>
+        <location filename="../build/ui_preferences.h" line="1340"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="537"/>
+        <location filename="../qt-ui/preferences.ui" line="691"/>
+        <location filename="../build/ui_preferences.h" line="1342"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="552"/>
+        <location filename="../qt-ui/preferences.ui" line="706"/>
+        <location filename="../build/ui_preferences.h" line="1343"/>
         <source>Time units</source>
         <translation>Jednostki czasu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="565"/>
+        <location filename="../qt-ui/preferences.ui" line="719"/>
+        <location filename="../build/ui_preferences.h" line="1345"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="575"/>
+        <location filename="../qt-ui/preferences.ui" line="729"/>
+        <location filename="../build/ui_preferences.h" line="1346"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="607"/>
+        <location filename="../qt-ui/preferences.ui" line="818"/>
+        <location filename="../build/ui_preferences.h" line="1351"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="788"/>
+        <location filename="../qt-ui/preferences.ui" line="999"/>
+        <location filename="../build/ui_preferences.h" line="1362"/>
         <source>GFLow at max depth</source>
         <translation>GFLow na maksymalnej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="748"/>
+        <location filename="../qt-ui/preferences.ui" line="959"/>
+        <location filename="../build/ui_preferences.h" line="1359"/>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="14"/>
+        <location filename="../build/ui_preferences.h" line="1283"/>
         <source>Preferences</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="558"/>
+        <location filename="../qt-ui/preferences.ui" line="521"/>
+        <location filename="../build/ui_preferences.h" line="1324"/>
+        <source>&amp;Metric</source>
+        <translation>Metryczny</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="541"/>
+        <location filename="../build/ui_preferences.h" line="1326"/>
+        <source>Personali&amp;ze</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="554"/>
+        <location filename="../build/ui_preferences.h" line="1327"/>
+        <source>Individual settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="627"/>
+        <location filename="../build/ui_preferences.h" line="1335"/>
+        <source>&amp;liter</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="712"/>
+        <location filename="../build/ui_preferences.h" line="1344"/>
         <source>Ascent/descent speed denominator</source>
         <translation>Mianownik szybkości zanurzania/wynurzania </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="618"/>
+        <location filename="../qt-ui/preferences.ui" line="744"/>
+        <location filename="../build/ui_preferences.h" line="1347"/>
+        <source>GPS coordinates</source>
+        <translation>Współrzędne GPS</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="750"/>
+        <location filename="../build/ui_preferences.h" line="1348"/>
+        <source>Location Display</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="757"/>
+        <location filename="../build/ui_preferences.h" line="1349"/>
+        <source>traditional (dms)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="767"/>
+        <location filename="../build/ui_preferences.h" line="1350"/>
+        <source>decimal</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="829"/>
+        <location filename="../build/ui_preferences.h" line="1352"/>
         <source>Threshold when showing pO₂</source>
         <translation>Próg ostrzeżenia dla  pO₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="642"/>
+        <location filename="../qt-ui/preferences.ui" line="853"/>
+        <location filename="../build/ui_preferences.h" line="1353"/>
         <source>Threshold when showing pN₂</source>
         <translation>Próg ostrzeżenia dla  pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="666"/>
+        <location filename="../qt-ui/preferences.ui" line="877"/>
+        <location filename="../build/ui_preferences.h" line="1354"/>
         <source>Threshold when showing pHe</source>
         <translation>Próg ostrzeżenia dla  pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="690"/>
+        <location filename="../qt-ui/preferences.ui" line="901"/>
+        <location filename="../build/ui_preferences.h" line="1355"/>
         <source>Max pO₂ when showing MOD</source>
         <translation>Max ppO₂ gdy wyświetlany jest MOD</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="714"/>
+        <location filename="../qt-ui/preferences.ui" line="925"/>
+        <location filename="../build/ui_preferences.h" line="1356"/>
         <source>Draw dive computer reported ceiling red</source>
         <translation>Pokazuj sufit z komputera nurkowego na czerwono</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="725"/>
+        <location filename="../qt-ui/preferences.ui" line="936"/>
+        <location filename="../build/ui_preferences.h" line="1357"/>
         <source>Show unused cylinders in Equipment tab</source>
         <translation>Pokazju nieużywane butle w zakładce Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="736"/>
+        <location filename="../qt-ui/preferences.ui" line="947"/>
+        <location filename="../build/ui_preferences.h" line="1358"/>
         <source>Show average depth</source>
         <translation>Pokazuj głębokość średnią</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="754"/>
+        <location filename="../qt-ui/preferences.ui" line="965"/>
+        <location filename="../build/ui_preferences.h" line="1360"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="982"/>
+        <location filename="../build/ui_preferences.h" line="1361"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="38"/>
+        <location filename="../qt-ui/preferences.cpp" line="42"/>
         <source>No proxy</source>
         <translation>Bez proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="39"/>
+        <location filename="../qt-ui/preferences.cpp" line="43"/>
         <source>System proxy</source>
         <translation>Systemowe proxy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="40"/>
+        <location filename="../qt-ui/preferences.cpp" line="44"/>
         <source>HTTP proxy</source>
         <translation>Proxy HTTP</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="41"/>
+        <location filename="../qt-ui/preferences.cpp" line="45"/>
         <source>SOCKS proxy</source>
         <translation>Proxy SOCKS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="80"/>
+        <location filename="../qt-ui/preferences.cpp" line="86"/>
         <source>To disconnect Subsurface from your Facebook account, use the button below</source>
         <translation>Użyj przycisku poniżej, żeby odłączyć Subsurface od swojego konta na Facebooku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="94"/>
+        <location filename="../qt-ui/preferences.cpp" line="100"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
         <translation>Zaloguj się, aby połączyć się z Facebookiem. Pozwoli to Subsurface publikować nurkowania na Twojej osi czasu.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="333"/>
+        <location filename="../qt-ui/preferences.cpp" line="120"/>
+        <source>Subsurface cloud storage (credentials verified)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="329"/>
         <source>Restart required</source>
         <translation>Wymagane ponowne uruchomienie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="334"/>
+        <location filename="../qt-ui/preferences.cpp" line="330"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
         <translation>Aby użyć nowego języka musisz ponownie uruchomić Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="503"/>
+        <location filename="../qt-ui/preferences.cpp" line="360"/>
+        <location filename="../qt-ui/preferences.cpp" line="382"/>
+        <location filename="../qt-ui/preferences.cpp" line="395"/>
+        <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="487"/>
         <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source>
         <translation>Jeśli klikniesz OK, wszystkie ustawienia Subsurface zostaną przywrócone do ich wartości początkowych - z natychmiastowym skutkiem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="489"/>
+        <location filename="../qt-ui/preferences.cpp" line="473"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="489"/>
+        <location filename="../qt-ui/preferences.cpp" line="473"/>
         <source>Open default log file</source>
         <translation>Otwórz domyślny plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="502"/>
+        <location filename="../qt-ui/preferences.cpp" line="486"/>
         <source>Warning</source>
         <translation>Ostrzeżenie</translation>
     </message>
@@ -4241,191 +5648,187 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="85"/>
+        <location filename="../qt-ui/printdialog.cpp" line="119"/>
         <source>&amp;Preview</source>
         <translation>Podgląd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="82"/>
+        <location filename="../qt-ui/printdialog.cpp" line="116"/>
         <source>P&amp;rint</source>
         <translation>Drukuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="97"/>
+        <location filename="../qt-ui/printdialog.cpp" line="131"/>
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
 </context>
 <context>
-    <name>PrintLayout</name>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="20"/>
-        <source>Dive#</source>
-        <translation>Nurkowanie nr</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="21"/>
-        <source>Date</source>
-        <translation>Data</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="22"/>
-        <source>Depth</source>
-        <translation>Głębokość</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printlayout.cpp" line="23"/>
-        <source>Duration</source>
-        <translation>Czas</translation>
-    </message>
+    <name>PrintOptions</name>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="24"/>
-        <source>Master</source>
-        <translation>Divemaster</translation>
+        <location filename="../build/ui_printoptions.h" line="150"/>
+        <source>&amp;Table print</source>
+        <translation>&amp;Tabela</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
-        <source>Buddy</source>
-        <translation>Partner</translation>
+        <location filename="../build/ui_printoptions.h" line="158"/>
+        <source>One dive per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
-        <source>Location</source>
-        <translation>Miejsce</translation>
+        <location filename="../build/ui_printoptions.h" line="159"/>
+        <source>Two dives per page</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="63"/>
-        <source>Subsurface cannot find a usable printer on this system!</source>
-        <translation>Subsurface nie może znaleźć drukarki!</translation>
-    </message>
-</context>
-<context>
-    <name>PrintOptions</name>
-    <message>
         <location filename="../qt-ui/printoptions.ui" line="41"/>
-        <source>&amp;6 dives per page</source>
-        <translation>&amp;6 nurkowań na stronę</translation>
+        <location filename="../build/ui_printoptions.h" line="149"/>
+        <source>&amp;Dive list print</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="57"/>
-        <source>&amp;1 dive per page</source>
-        <translation>&amp;1 nurkowanie na stronę</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="70"/>
-        <source>&amp;2 dives per page</source>
-        <translation>&amp;2 nurkowania na stronę</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/printoptions.ui" line="83"/>
-        <source>&amp;Table print</source>
-        <translation>&amp;Tabela</translation>
+        <location filename="../build/ui_printoptions.h" line="151"/>
+        <source>&amp;Statistics print</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="106"/>
+        <location filename="../qt-ui/printoptions.ui" line="67"/>
+        <location filename="../build/ui_printoptions.h" line="152"/>
         <source>Print options</source>
         <translation>Opcje drukowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="118"/>
+        <location filename="../qt-ui/printoptions.ui" line="79"/>
+        <location filename="../build/ui_printoptions.h" line="153"/>
         <source>Print only selected dives</source>
         <translation>Drukuj tylko zaznaczone nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="131"/>
+        <location filename="../qt-ui/printoptions.ui" line="92"/>
+        <location filename="../build/ui_printoptions.h" line="154"/>
         <source>Print in color</source>
         <translation>Drukuj w kolorze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="153"/>
-        <source>Prof&amp;ile on top</source>
-        <translation>Prof&amp;il na górze</translation>
+        <location filename="../qt-ui/printoptions.ui" line="102"/>
+        <location filename="../build/ui_printoptions.h" line="155"/>
+        <source>Template</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="169"/>
-        <source>&amp;Notes on top</source>
-        <translation>&amp;Notatki na górze</translation>
+        <location filename="../qt-ui/printoptions.ui" line="127"/>
+        <location filename="../build/ui_printoptions.h" line="161"/>
+        <source>Edit</source>
+        <translation>Edytuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="134"/>
+        <source>Delete</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="141"/>
+        <source>Export</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.ui" line="148"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/printoptions.ui" line="29"/>
+        <location filename="../build/ui_printoptions.h" line="148"/>
         <source>Print type</source>
         <translation>Rodzaj wydruku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printoptions.ui" line="141"/>
-        <source>Ordering</source>
-        <translation>Kolejność</translation>
+        <location filename="../qt-ui/printoptions.cpp" line="150"/>
+        <source>Import template file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.cpp" line="151"/>
+        <location filename="../qt-ui/printoptions.cpp" line="164"/>
+        <source>HTML files (*.html)</source>
+        <translation>Pliki HTML (*.html)</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printoptions.cpp" line="163"/>
+        <source>Export template files as</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ProfilePrintModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2101"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="44"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2106"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="49"/>
         <source>Dive #%1 - %2</source>
         <translation>Nurkownie #%1 - %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2109"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="52"/>
         <source>Max depth: %1 %2</source>
         <translation>Max głębokość: %1 %2</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2116"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="59"/>
         <source>Duration: %1 min</source>
         <translation>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2121"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="64"/>
         <source>Gas used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2123"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="66"/>
         <source>Tags:</source>
         <translation>Tagi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2125"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="68"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2127"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="70"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2132"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="75"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2139"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="82"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2141"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="84"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2143"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="86"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2145"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="88"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="2147"/>
+        <location filename="../qt-models/profileprintmodel.cpp" line="90"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
@@ -4433,108 +5836,113 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="628"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="658"/>
         <source> (#%1 of %2)</source>
         <translation> (#%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="630"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="660"/>
         <source>Unknown dive computer</source>
         <translation>Nieznany komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="647"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="677"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1168"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1224"/>
         <source>Make first divecomputer</source>
         <translation>Ustaw jako pierwszy komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1170"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1226"/>
         <source>Delete this divecomputer</source>
         <translation>Usuń ten komputer nurkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1184"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1240"/>
         <source>Add gas change</source>
         <translation>Dodaj zmianę gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1187"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1243"/>
         <source> (Tank %1)</source>
         <translation> (Butla %1)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1195"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1251"/>
         <source>Add set-point change</source>
         <translation>Dodaj zmianę set-point</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1197"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1253"/>
         <source>Add bookmark</source>
         <translation>Dodaj notatkę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1201"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1257"/>
+        <source>Edit the profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1261"/>
         <source>Remove event</source>
         <translation>Usuń znacznik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1206"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1266"/>
         <source>Hide similar events</source>
         <translation>Ukryj podobne znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1213"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1273"/>
         <source>Edit name</source>
         <translation>Zmień nazwę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1242"/>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1249"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1302"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1309"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Zmień ciśnienie w butli %1 (obecnie interpolowane jako %2)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1264"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1324"/>
         <source>Unhide all events</source>
         <translation>Odkryj wszystkie znaczniki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/>
         <source>Hide events</source>
         <translation>Ukrywanie wydarzeń</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1298"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1358"/>
         <source>Hide all %1 events?</source>
         <translation>Ukyć wszystkie wydarzenia typu %1?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1333"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1393"/>
         <source>Remove the selected event?</source>
         <translation>Usunąć wybrane wydarzenie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1334"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1394"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1424"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1498"/>
         <source>Edit name of bookmark</source>
         <translation>Zmień nazwę wydarzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1425"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1499"/>
         <source>Custom name:</source>
         <translation>Własna nazwa:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1430"/>
+        <location filename="../qt-ui/profile/profilewidget2.cpp" line="1504"/>
         <source>Name is too long!</source>
         <translation>Nazwa jest za długa!</translation>
     </message>
@@ -4542,102 +5950,97 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
+        <location filename="../qthelper.cpp" line="1210"/>
         <source>AIR</source>
         <translation>POWIETRZE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="22"/>
+        <location filename="../qthelper.cpp" line="1210"/>
         <source>OXYGEN</source>
         <translation>TLEN</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.cpp" line="208"/>
+        <location filename="../qt-ui/diveplanner.cpp" line="55"/>
         <source>Remove this point</source>
         <translation>Usuń ten punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/kmessagewidget.cpp" line="57"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="25"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="30"/>
         <source>Average</source>
         <translation>średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="28"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="33"/>
         <source>Minimum</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="31"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="36"/>
         <source>Maximum</source>
         <translation>max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="296"/>
+        <location filename="../qt-ui/globe.cpp" line="322"/>
         <source>Move the map and double-click to set the dive location</source>
         <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="525"/>
+        <location filename="../qthelper.cpp" line="1224"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="526"/>
+        <location filename="../qthelper.cpp" line="1225"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="550"/>
+        <location filename="../qthelper.cpp" line="1248"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="551"/>
+        <location filename="../qthelper.cpp" line="1249"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="574"/>
+        <location filename="../qthelper.cpp" line="1271"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="575"/>
+        <location filename="../qthelper.cpp" line="1272"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="599"/>
+        <location filename="../qthelper.cpp" line="1294"/>
         <source>l</source>
         <translation>l</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="600"/>
+        <location filename="../qthelper.cpp" line="1295"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="513"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="593"/>
         <source>Invalid response from server</source>
         <translation>Niepoprawna odpowiedź z serwera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="601"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
         <translation>Oczekiwano tagu XML &apos;DiveDateReader&apos;, zamiast tego odczytano &apos;%1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="567"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="647"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
         <translation>Oczekiwany tag XML  &apos;DiveDates&apos; nie został znaleziony</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="654"/>
         <source>Malformed XML response. Line %1: %2</source>
         <translation>Uszkodzona odpowiedź XML. Linia  %1: %2</translation>
     </message>
@@ -4645,12 +6048,17 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ReadSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1520"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1586"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1638"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1512"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1641"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -4659,17 +6067,19 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>RenumberDialog</name>
     <message>
         <location filename="../qt-ui/renumber.ui" line="17"/>
+        <location filename="../build/ui_renumber.h" line="79"/>
         <source>Renumber</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
         <location filename="../qt-ui/renumber.ui" line="43"/>
-        <location filename="../qt-ui/simplewidgets.cpp" line="134"/>
+        <location filename="../build/ui_renumber.h" line="80"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="139"/>
         <source>New starting number</source>
         <translation>Nowy numer początkowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="132"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="137"/>
         <source>New number</source>
         <translation>Nowy numer</translation>
     </message>
@@ -4677,12 +6087,17 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>ResetSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1655"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1816"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1837"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1659"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1840"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -4691,6 +6106,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>SearchBar</name>
     <message>
         <location filename="../qt-ui/searchbar.ui" line="14"/>
+        <location filename="../build/ui_searchbar.h" line="120"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
@@ -4699,16 +6115,19 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>SetpointDialog</name>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="17"/>
+        <location filename="../build/ui_setpoint.h" line="82"/>
         <source>Renumber</source>
         <translation>Zmień numerację</translation>
     </message>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="43"/>
+        <location filename="../build/ui_setpoint.h" line="83"/>
         <source>New set-point (0 for OC)</source>
         <translation>Nowy set-point (0 dla OC)</translation>
     </message>
     <message>
         <location filename="../qt-ui/setpoint.ui" line="61"/>
+        <location filename="../build/ui_setpoint.h" line="84"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -4717,56 +6136,73 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>ShiftImageTimesDialog</name>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="34"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="185"/>
         <source>Shift times of image(s) by</source>
         <translation>Przesuń czasy zdjęć o</translation>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="95"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="186"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="23"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="184"/>
         <source>Shift selected image times</source>
         <translation>Zmiana czasów nurkowań</translation>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="105"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="187"/>
         <source>Earlier</source>
         <translation>Wcześniej</translation>
     </message>
     <message>
         <location filename="../qt-ui/shiftimagetimes.ui" line="112"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="188"/>
         <source>Later</source>
         <translation>Później</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="148"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="128"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="189"/>
+        <source>Warning!
+Not all images have timestamps in the range between
+30 minutes before the start and 30 minutes after the end of any selected dive.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="173"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="193"/>
         <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
         <translation>Aby uwzględnić różnicę w ustawieniach zegarów komputera nurkowego i aparatu fotograficznego użyj aparatu do zrobienia zdjęcia komputera nurkowego, gdy ten wyświetla aktualny czas. Zgraj to zdjęcie na swój komputer i wciśnij ten przycisk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="158"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="183"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="195"/>
         <source>Determine camera time offset</source>
         <translation>Uwzględnij przesunięcie zegara aparatu fotograficznego</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="161"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="186"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="197"/>
         <source>Select image of divecomputer showing time</source>
         <translation>Wybierz zdjęcie komputera nurkowego (pokazujące aktualny czas)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/shiftimagetimes.ui" line="183"/>
+        <location filename="../qt-ui/shiftimagetimes.ui" line="208"/>
+        <location filename="../build/ui_shiftimagetimes.h" line="199"/>
         <source>Which date and time are displayed on the image?</source>
         <translation>Jaka data i godzina jest na zdjęciu?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="259"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="289"/>
         <source>Open image file</source>
         <translation>Otwórz zdjęcie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="261"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="291"/>
         <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
         <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
     </message>
@@ -4775,97 +6211,139 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>ShiftTimesDialog</name>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="23"/>
+        <location filename="../build/ui_shifttimes.h" line="136"/>
         <source>Shift selected dive times</source>
         <translation>Zmiana czasów nurkowań</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="49"/>
+        <location filename="../build/ui_shifttimes.h" line="137"/>
         <source>Shift times of selected dives by</source>
         <translation>Przesuń czasy wybranych nurkowań o</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="72"/>
+        <location filename="../build/ui_shifttimes.h" line="138"/>
         <source>Shifted time:</source>
         <translation>Przesunięty czas:</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="79"/>
+        <location filename="../build/ui_shifttimes.h" line="139"/>
         <source>Current time:</source>
         <translation>Aktualny czas:</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="86"/>
         <location filename="../qt-ui/shifttimes.ui" line="93"/>
+        <location filename="../build/ui_shifttimes.h" line="140"/>
+        <location filename="../build/ui_shifttimes.h" line="141"/>
         <source>0:0</source>
         <translation>0:0</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="126"/>
+        <location filename="../build/ui_shifttimes.h" line="142"/>
         <source>h:mm</source>
         <translation>h:mm</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="136"/>
+        <location filename="../build/ui_shifttimes.h" line="143"/>
         <source>Earlier</source>
         <translation>Wcześniej</translation>
     </message>
     <message>
         <location filename="../qt-ui/shifttimes.ui" line="143"/>
+        <location filename="../build/ui_shifttimes.h" line="144"/>
         <source>Later</source>
         <translation>Później</translation>
     </message>
 </context>
 <context>
+    <name>SimpleDiveSiteEditDialog</name>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="99"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="100"/>
+        <source>Name</source>
+        <translation>Nazwa</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="101"/>
+        <source>Coordinates</source>
+        <translation>Współrzędne</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="102"/>
+        <source>Description</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="103"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../build/ui_simpledivesiteedit.h" line="104"/>
+        <source>Dive site quick edit. Hit ESC or click outside to close</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>SocialNetworkDialog</name>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="283"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="298"/>
         <source>Dive date: %1 
 </source>
         <translation>Data nurkowania: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="286"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="301"/>
         <source>Duration: %1 
 </source>
         <translation>Czas: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="287"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="302"/>
         <source>h:</source>
         <comment>abbreviation for hours plus separator</comment>
         <translation>h:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="288"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="303"/>
         <source>min</source>
         <comment>abbreviation for minutes</comment>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="291"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="306"/>
         <source>Dive location: %1 
 </source>
         <translation>Miejsce nurkowania: %1
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="294"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="309"/>
         <source>Buddy: %1 
 </source>
         <translation>Partner: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="297"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="312"/>
         <source>Divemaster: %1 
 </source>
         <translation>Divemaster: %1 
 </translation>
     </message>
     <message>
-        <location filename="../qt-ui/socialnetworks.cpp" line="300"/>
+        <location filename="../qt-ui/socialnetworks.cpp" line="315"/>
         <source>
 %1</source>
         <translation>
@@ -4876,61 +6354,73 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>SocialnetworksDialog</name>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="14"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="140"/>
         <source>Dialog</source>
         <translation>Dialog</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="57"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="141"/>
         <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source>
         <translation>Tekst po prawej zostanie użyty jako opis Twojego profilu nurkowego. Nazwa albumu jest wymagana (obraz profilu zostanie dodany do tego albumu)</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="70"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="142"/>
         <source>Album</source>
         <translation>Album</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="77"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="144"/>
         <source>The profile picture will be posted in this album (required)</source>
         <translation>Dodaj profil do tego albumu (wymagane)</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="84"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="146"/>
         <source>Include</source>
         <translation>Załącz</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="91"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="147"/>
         <source>Date and time</source>
         <translation>Data i czas</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="98"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="148"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="105"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="149"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="112"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="150"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="119"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="151"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="126"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="152"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
         <location filename="../qt-ui/socialnetworksdialog.ui" line="139"/>
+        <location filename="../build/ui_socialnetworksdialog.h" line="153"/>
         <source>Facebook post preview</source>
         <translation>Podgląd</translation>
     </message>
@@ -4939,26 +6429,30 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>SubsurfaceAbout</name>
     <message>
         <location filename="../qt-ui/about.ui" line="23"/>
+        <location filename="../build/ui_about.h" line="109"/>
         <source>About Subsurface</source>
         <translation>O Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="80"/>
+        <location filename="../build/ui_about.h" line="112"/>
         <source>&amp;License</source>
         <translation>Licencja</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="87"/>
+        <location filename="../build/ui_about.h" line="113"/>
         <source>&amp;Website</source>
         <translation>Strona WWW</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.ui" line="94"/>
+        <location filename="../build/ui_about.h" line="114"/>
         <source>&amp;Close</source>
         <translation>Zamknij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/about.cpp" line="18"/>
+        <location filename="../qt-ui/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2015&lt;/span&gt;</source>
         <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Wieloplatformowy log nurkowy&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava i inni, 2011-2015&lt;/span&gt;</translation>
     </message>
@@ -4966,47 +6460,47 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>SubsurfaceWebServices</name>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="329"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="387"/>
         <source>Webservice</source>
         <translation>Usługa Internetowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="393"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="473"/>
         <source>Connecting...</source>
         <translation>Łączenie...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="412"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="492"/>
         <source>Download finished</source>
         <translation>Pobieranie zakończone</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="426"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="506"/>
         <source>Download error: %1</source>
         <translation>Błąd pobierania: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="436"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="516"/>
         <source>Connection error: </source>
         <translation>Błąd połączenia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="445"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="525"/>
         <source>Download successful</source>
         <translation>Pobieranie zakończone sukcesem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="439"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="519"/>
         <source>Invalid user identifier!</source>
         <translation>Niepoprawny identyfikator użytkownika!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="312"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="366"/>
         <source>Enter User ID and click Download</source>
         <translation>Podaj ID użytkownika i wciśnij Pobierz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="442"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="522"/>
         <source>Cannot parse response!</source>
         <translation>Nie można przetworzyć odpowiedzi!</translation>
     </message>
@@ -5014,7 +6508,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>SuitFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="575"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="648"/>
         <source>Suits: </source>
         <translation>Skafandry:</translation>
     </message>
@@ -5022,7 +6516,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>SuitsFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="116"/>
+        <location filename="../qt-models/filtermodels.cpp" line="119"/>
         <source>No suit set</source>
         <translation>nie podano skafandra</translation>
     </message>
@@ -5032,6 +6526,8 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <message>
         <location filename="../qt-ui/tableview.ui" line="14"/>
         <location filename="../qt-ui/tableview.ui" line="17"/>
+        <location filename="../build/ui_tableview.h" line="49"/>
+        <location filename="../build/ui_tableview.h" line="50"/>
         <source>GroupBox</source>
         <translation>GroupBox</translation>
     </message>
@@ -5039,7 +6535,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TagFilter</name>
     <message>
-        <location filename="../qt-ui/simplewidgets.cpp" line="496"/>
+        <location filename="../qt-ui/simplewidgets.cpp" line="569"/>
         <source>Tags: </source>
         <translation>Tagi:</translation>
     </message>
@@ -5047,7 +6543,7 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TagFilterModel</name>
     <message>
-        <location filename="../qt-ui/filtermodels.cpp" line="141"/>
+        <location filename="../qt-models/filtermodels.cpp" line="144"/>
         <source>Empty tags</source>
         <translation>brak tagów</translation>
     </message>
@@ -5055,22 +6551,248 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
 <context>
     <name>TankInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="916"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="916"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="916"/>
+        <location filename="../qt-models/tankinfomodel.cpp" line="86"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
 </context>
 <context>
+    <name>TemplateEdit</name>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="37"/>
+        <source>Preview</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="94"/>
+        <source>Style</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="104"/>
+        <source>Font</source>
+        <translation>Czcionka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="112"/>
+        <source>Arial</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="117"/>
+        <source>Impact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="122"/>
+        <source>Georgia</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="127"/>
+        <source>Courier</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="132"/>
+        <source>Verdana</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="144"/>
+        <source>Font size</source>
+        <translation>Rozmiar czcionki</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="14"/>
+        <source>Edit template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="165"/>
+        <source>Color palette</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="173"/>
+        <source>Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="178"/>
+        <source>Almond</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="183"/>
+        <source>Shades of blue</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="188"/>
+        <source>Custom</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="200"/>
+        <source>Line spacing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="241"/>
+        <source>Template</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="264"/>
+        <source>Colors</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="280"/>
+        <source>Background</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="293"/>
+        <source>color1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="303"/>
+        <location filename="../qt-ui/templateedit.ui" line="343"/>
+        <location filename="../qt-ui/templateedit.ui" line="383"/>
+        <location filename="../qt-ui/templateedit.ui" line="423"/>
+        <location filename="../qt-ui/templateedit.ui" line="463"/>
+        <location filename="../qt-ui/templateedit.ui" line="503"/>
+        <source>Edit</source>
+        <translation>Edytuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="320"/>
+        <source>Table cells 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="333"/>
+        <source>color2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="360"/>
+        <source>Table cells 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="373"/>
+        <source>color3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="400"/>
+        <source>Text 1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="413"/>
+        <source>color4</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="440"/>
+        <source>Text 2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="453"/>
+        <source>color5</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="480"/>
+        <source>Borders</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/templateedit.ui" line="493"/>
+        <source>color6</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>TestParse</name>
+    <message>
+        <location filename="../tests/testparse.cpp" line="296"/>
+        <source>Sample time</source>
+        <translation>Czas próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="298"/>
+        <source>Sample depth</source>
+        <translation>Głębokość próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="300"/>
+        <source>Sample temperature</source>
+        <translation>Temperatura próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="302"/>
+        <source>Sample pO₂</source>
+        <translation>pO₂ próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="304"/>
+        <source>Sample sensor1 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="306"/>
+        <source>Sample sensor2 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="308"/>
+        <source>Sample sensor3 pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="310"/>
+        <source>Sample CNS</source>
+        <translation>CNS próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="312"/>
+        <source>Sample NDL</source>
+        <translation>NDL próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="314"/>
+        <source>Sample TTS</source>
+        <translation>TTS próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="316"/>
+        <source>Sample stopdepth</source>
+        <translation>Przystanek próbki</translation>
+    </message>
+    <message>
+        <location filename="../tests/testparse.cpp" line="318"/>
+        <source>Sample pressure</source>
+        <translation>Ciśnienie próbki</translation>
+    </message>
+</context>
+<context>
     <name>ToolTipItem</name>
     <message>
         <location filename="../qt-ui/profile/divetooltipitem.cpp" line="131"/>
@@ -5079,82 +6801,105 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     </message>
 </context>
 <context>
+    <name>TopBar</name>
+    <message>
+        <location filename="../qt-mobile/TopBar.qml" line="59"/>
+        <source>Subsurface mobile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>TripItem</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1094"/>
+        <location filename="../qt-models/divetripmodel.cpp" line="65"/>
         <source> (%1 shown)</source>
         <translation> (%1 pokazane)</translation>
     </message>
 </context>
 <context>
+    <name>URLDialog</name>
+    <message>
+        <location filename="../qt-ui/urldialog.ui" line="14"/>
+        <location filename="../build/ui_urldialog.h" line="57"/>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/urldialog.ui" line="52"/>
+        <location filename="../build/ui_urldialog.h" line="58"/>
+        <source>Enter URL for images</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>UpdateManager</name>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="81"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="83"/>
         <source>Check for updates.</source>
         <translation>Sprawdzanie dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="82"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="84"/>
         <source>Subsurface was unable to check for updates.</source>
         <translation>Nie udało się sprawdzić dostępności aktualizacji.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="87"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="89"/>
         <source>The following error occurred:</source>
         <translation>Natrafiono na następujący błąd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="88"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="90"/>
         <source>Please check your internet connection.</source>
         <translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="98"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="100"/>
         <source>You are using the latest version of Subsurface.</source>
         <translation>Używasz najnowszej wersji Subsurface.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="101"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="103"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
         <translation>Nowa wersja Subsurface jest dostępna.&lt;br/&gt;Kliknij na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; aby ją pobrać.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="107"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="109"/>
         <source>A new version of Subsurface is available.</source>
         <translation>Nowsza wersja Subsurface jest dostępna.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="108"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="110"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
         <translation>Najnowsza wersja to %1,  informacje jak zaktualizować aplikację znajdziesz na %2 naszej stronie %3</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="118"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="120"/>
         <source>Newest release version is </source>
         <translation>Najnowsza wersja to </translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="119"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="121"/>
         <source>The server returned the following information:</source>
         <translation>Serwer zwrócił następującą informację:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="136"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="139"/>
         <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
         <translation>Subsurface sprawdza dostępność nowej wersji co dwa tygodnie. Jeśli nie chcesz, żeby Subsurface kontynuował sprawdzanie kliknij Przestań.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="137"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="140"/>
         <source>Decline</source>
         <translation>Przestań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="138"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="141"/>
         <source>Accept</source>
         <translation>Zatwierdź</translation>
     </message>
     <message>
-        <location filename="../qt-ui/updatemanager.cpp" line="140"/>
+        <location filename="../qt-ui/updatemanager.cpp" line="143"/>
         <source>Automatic check for updates</source>
         <translation>Automatyczne sprawdzanie aktualizacji </translation>
     </message>
@@ -5177,71 +6922,85 @@ Uaktywnij bluetooth na swoim OSTC Sport i przed kontynuowaniem aktualizacji wyko
     <name>UserSurvey</name>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="44"/>
+        <location filename="../build/ui_usersurvey.h" line="151"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Chcielibyśmy dowiedzieć się więcej o naszych użytkownikach, ich preferencjach i sposobie korzystania z programu Subsurface. Prosimy Cię o poświęcenie kilku chwil na wypełnienie tej ankiety i podzielenie się informacjami z ekipą Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="115"/>
+        <location filename="../build/ui_usersurvey.h" line="156"/>
         <source>Other software/sources</source>
         <translation>Z inne źródeł / innego programu</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="128"/>
+        <location filename="../build/ui_usersurvey.h" line="157"/>
         <source>Manually entering dives</source>
         <translation>Wprowadzam nurkowania ręcznie</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="14"/>
+        <location filename="../build/ui_usersurvey.h" line="149"/>
         <source>User survey</source>
         <translation>Ankieta</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="31"/>
+        <location filename="../build/ui_usersurvey.h" line="150"/>
         <source>Subsurface user survey</source>
         <translation>Ankieta Subsurface</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="63"/>
+        <location filename="../build/ui_usersurvey.h" line="152"/>
         <source>Technical diver</source>
         <translation>Technicznym</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="76"/>
+        <location filename="../build/ui_usersurvey.h" line="153"/>
         <source>Recreational diver</source>
         <translation>Rekreacyjnym</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="89"/>
+        <location filename="../build/ui_usersurvey.h" line="154"/>
         <source>Dive planner</source>
         <translation>Używam Subsurface do planowania nurkowań</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="102"/>
+        <location filename="../build/ui_usersurvey.h" line="155"/>
         <source>Supported dive computer</source>
         <translation>Pobieram ze wspieranego komputera nurkowego</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="141"/>
+        <location filename="../build/ui_usersurvey.h" line="158"/>
         <source>Android/iPhone companion app</source>
         <translation>Z aplikacji Subsurface dla Androida lub iPhone&apos;a</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="154"/>
+        <location filename="../build/ui_usersurvey.h" line="159"/>
         <source>Any suggestions? (in English)</source>
         <translation>Uwagi i sugestie? (po angielsku) </translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="177"/>
+        <location filename="../build/ui_usersurvey.h" line="160"/>
         <source>The following information about your system will also be submitted.</source>
         <translation>Zostaną dołączone także następujące informacje o Twoim systemie.</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="231"/>
+        <location filename="../build/ui_usersurvey.h" line="161"/>
         <source>What kind of diver are you?</source>
         <translation>Jakim rodzajem nurka jesteś?</translation>
     </message>
     <message>
         <location filename="../qt-ui/usersurvey.ui" line="270"/>
+        <location filename="../build/ui_usersurvey.h" line="162"/>
         <source>Where are you importing data from?</source>
         <translation>Skąd pochodzą Twoje nurkowania?</translation>
     </message>
@@ -5274,27 +7033,27 @@ Language: %1</source>
 Język: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="95"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="79"/>
         <source>Should we ask you later?</source>
         <translation>Czy powinniśmy zapytać Cię ponownie?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="96"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="80"/>
         <source>Don&apos;t ask me again</source>
         <translation>Nie pytajcie mnie ponownie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="97"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="81"/>
         <source>Ask later</source>
         <translation>Zapytaj później</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="101"/>
         <source>Submit user survey.</source>
         <translation>Wysyłanie ankiety.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="98"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="82"/>
         <source>Ask again?</source>
         <translation>Zapytać ponownie?</translation>
     </message>
@@ -5304,27 +7063,27 @@ Język: %1</translation>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="118"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="102"/>
         <source>Subsurface was unable to submit the user survey.</source>
         <translation>Subsurface nie był w stanie wysłać ankiety.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="123"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="107"/>
         <source>The following error occurred:</source>
         <translation>Natrafiono na następujący błąd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="124"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="108"/>
         <source>Please check your internet connection.</source>
         <translation>Sprawdź proszę swoje połączenie z Internetem.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="133"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="117"/>
         <source>Survey successfully submitted.</source>
         <translation>Ankieta pomyślnie wysłana.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/usersurvey.cpp" line="138"/>
+        <location filename="../qt-ui/usersurvey.cpp" line="122"/>
         <source>There was an error while trying to check for updates.&lt;br/&gt;&lt;br/&gt;%1</source>
         <translation>Wystąpił błąd podczas sprawdzania dostępności aktualizacji.&lt;br/&gt;&lt;br/&gt;%1</translation>
     </message>
@@ -5332,12 +7091,12 @@ Język: %1</translation>
 <context>
     <name>WSInfoModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="787"/>
+        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="79"/>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="787"/>
+        <location filename="../qt-models/weigthsysteminfomodel.cpp" line="79"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -5346,51 +7105,59 @@ Język: %1</translation>
     <name>WebServices</name>
     <message>
         <location filename="../qt-ui/webservices.ui" line="14"/>
+        <location filename="../build/ui_webservices.h" line="129"/>
         <source>Web service connection</source>
         <translation>Połączenie z usługą internetową</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="25"/>
+        <location filename="../build/ui_webservices.h" line="130"/>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="32"/>
+        <location filename="../build/ui_webservices.h" line="131"/>
         <source>Enter your ID here</source>
         <translation>Podaj swoje ID</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="44"/>
+        <location filename="../build/ui_webservices.h" line="132"/>
         <source>Download</source>
         <translation>Pobierz</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="68"/>
+        <location filename="../build/ui_webservices.h" line="133"/>
         <source>User ID</source>
         <translation>ID użytkownika</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="85"/>
+        <location filename="../build/ui_webservices.h" line="135"/>
         <source>Save user ID locally?</source>
         <translation>Zapisywać ID użytkownika do pliku?</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="92"/>
+        <location filename="../build/ui_webservices.h" line="136"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
         <location filename="../qt-ui/webservices.ui" line="106"/>
+        <location filename="../build/ui_webservices.h" line="137"/>
         <source>Upload</source>
         <translation>Wyślij</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="247"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/>
         <source>Operation timed out</source>
         <translation>Przekroczony czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="268"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="322"/>
         <source>Transferring data...</source>
         <translation>Transfer danych...</translation>
     </message>
@@ -5398,37 +7165,51 @@ Język: %1</translation>
 <context>
     <name>WeightModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="434"/>
+        <location filename="../qt-models/weightmodel.cpp" line="13"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="434"/>
+        <location filename="../qt-models/weightmodel.cpp" line="13"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="500"/>
+        <location filename="../qt-models/weightmodel.cpp" line="77"/>
         <source>Clicking here will remove this weight system.</source>
         <translation>Kliknięcie tu usunie balast z listy.</translation>
     </message>
 </context>
 <context>
+    <name>WinBluetoothDeviceDiscoveryAgent</name>
+    <message>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="518"/>
+        <location filename="../qt-ui/btdeviceselectiondialog.cpp" line="549"/>
+        <source>No error</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>WriteSettingsThread</name>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1549"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1557"/>
-        <location filename="../configuredivecomputerthreads.cpp" line="1568"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1673"/>
+        <source>Unable to create libdivecomputer context</source>
+        <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
+    </message>
+    <message>
+        <location filename="../configuredivecomputerthreads.cpp" line="1692"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1700"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1710"/>
         <source>Failed!</source>
         <translation>Niepowodzenie!</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1578"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1719"/>
         <source>This feature is not yet available for the selected dive computer.</source>
         <translation>Ta opcja nie jest jeszcze dostępna dla wybranego komputera.</translation>
     </message>
     <message>
-        <location filename="../configuredivecomputerthreads.cpp" line="1582"/>
+        <location filename="../configuredivecomputerthreads.cpp" line="1722"/>
         <source>Could not a establish connection to the dive computer.</source>
         <translation>Nie udało się połączyć z komputerem nurkowym.</translation>
     </message>
@@ -5436,74 +7217,74 @@ Język: %1</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1847"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="126"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1850"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="129"/>
         <source>#</source>
         <translation>Ilość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1853"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="132"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1856"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="135"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1859"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="138"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1862"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="141"/>
         <source>
 Longest</source>
         <translation>najdłuższy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1865"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="144"/>
         <source>Depth (%1)
  Average</source>
         <translation>Głębokość (%1)
  średnia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1868"/>
-        <location filename="../qt-ui/models.cpp" line="1877"/>
-        <location filename="../qt-ui/models.cpp" line="1886"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="147"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="156"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="165"/>
         <source>
 Minimum</source>
         <translation>minimalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1871"/>
-        <location filename="../qt-ui/models.cpp" line="1880"/>
-        <location filename="../qt-ui/models.cpp" line="1889"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="150"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="159"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="168"/>
         <source>
 Maximum</source>
         <translation>maksymalna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1874"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="153"/>
         <source>SAC (%1)
  Average</source>
         <translation>SAC (%1)
  średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1883"/>
+        <location filename="../qt-models/yearlystatisticsmodel.cpp" line="162"/>
         <source>Temp. (%1)
  Average</source>
         <translation>Temperatura (%1)
@@ -5511,88 +7292,134 @@ Maximum</source>
     </message>
 </context>
 <context>
+    <name>getTextFromC</name>
+    <message>
+        <location filename="../taxonomy.c" line="6"/>
+        <source>None</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="7"/>
+        <source>Ocean</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="8"/>
+        <source>Country</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="9"/>
+        <source>State</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="10"/>
+        <source>County</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="11"/>
+        <source>Town</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../taxonomy.c" line="12"/>
+        <source>City</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>getextFromC</name>
+    <message>
+        <location filename="../libdivecomputer.c" line="640"/>
+        <source>Error parsing the header</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>gettextFromC</name>
     <message>
-        <location filename="../dive.c" line="191"/>
+        <location filename="../dive.c" line="193"/>
         <source>pascal</source>
         <translation>pascal</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="196"/>
-        <location filename="../qt-gui.cpp" line="340"/>
+        <location filename="../dive.c" line="198"/>
+        <location filename="../qthelper.cpp" line="895"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="200"/>
-        <location filename="../qt-gui.cpp" line="343"/>
+        <location filename="../dive.c" line="202"/>
+        <location filename="../qthelper.cpp" line="898"/>
         <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="242"/>
+        <location filename="../dive.c" line="244"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="279"/>
-        <location filename="../qt-gui.cpp" line="222"/>
-        <location filename="../qt-gui.cpp" line="237"/>
+        <location filename="../dive.c" line="281"/>
+        <location filename="../qthelper.cpp" line="777"/>
+        <location filename="../qthelper.cpp" line="792"/>
         <location filename="../worldmap-save.c" line="44"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="284"/>
-        <location filename="../qt-gui.cpp" line="225"/>
-        <location filename="../qt-gui.cpp" line="239"/>
+        <location filename="../dive.c" line="286"/>
+        <location filename="../qthelper.cpp" line="780"/>
+        <location filename="../qthelper.cpp" line="794"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="307"/>
+        <location filename="../dive.c" line="309"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="309"/>
+        <location filename="../dive.c" line="311"/>
         <source>m/s</source>
         <translation>m/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="314"/>
+        <location filename="../dive.c" line="316"/>
         <source>ft/min</source>
         <translation>ft/min</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="316"/>
+        <location filename="../dive.c" line="318"/>
         <source>ft/s</source>
         <translation>ft/s</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="335"/>
-        <location filename="../qt-gui.cpp" line="248"/>
-        <location filename="../qt-gui.cpp" line="258"/>
+        <location filename="../dive.c" line="337"/>
+        <location filename="../qthelper.cpp" line="803"/>
+        <location filename="../qthelper.cpp" line="813"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="339"/>
-        <location filename="../qt-gui.cpp" line="246"/>
-        <location filename="../qt-gui.cpp" line="256"/>
+        <location filename="../dive.c" line="341"/>
+        <location filename="../qthelper.cpp" line="801"/>
+        <location filename="../qthelper.cpp" line="811"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="1530"/>
+        <location filename="../dive.c" line="1558"/>
         <source>(%s) or (%s)</source>
         <translation>(%s) lub (%s)</translation>
     </message>
     <message>
-        <location filename="../divelist.c" line="468"/>
+        <location filename="../divelist.c" line="482"/>
         <location filename="../equipment.c" line="81"/>
-        <location filename="../planner.c" line="1081"/>
-        <location filename="../planner.c" line="1084"/>
+        <location filename="../planner.c" line="1365"/>
+        <location filename="../planner.c" line="1368"/>
         <source>air</source>
         <translation>powietrze</translation>
     </message>
@@ -5622,450 +7449,358 @@ Maximum</source>
         <translation>doczepiany</translation>
     </message>
     <message>
-        <location filename="../file.c" line="112"/>
-        <location filename="../file.c" line="434"/>
-        <location filename="../file.c" line="506"/>
-        <location filename="../file.c" line="925"/>
+        <location filename="../file.c" line="117"/>
+        <location filename="../file.c" line="456"/>
+        <location filename="../file.c" line="541"/>
+        <location filename="../file.c" line="938"/>
+        <location filename="../ostctools.c" line="82"/>
         <source>Failed to read &apos;%s&apos;</source>
         <translation>Błąd odczytu &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="377"/>
+        <location filename="../file.c" line="391"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
         <translation>Nie można otworzyć pliku CSV  %s; Użyj opcji Importowanie logów nurkowych.</translation>
     </message>
     <message>
-        <location filename="../file.c" line="600"/>
+        <location filename="../file.c" line="458"/>
+        <source>Empty file &apos;%s&apos;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../file.c" line="638"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
         <translation>Błąd importu: nie można odczytać &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="629"/>
+        <location filename="../file.c" line="674"/>
         <source>Mouth piece position OC</source>
         <translation>Pozycja ustnika: OC</translation>
     </message>
     <message>
-        <location filename="../file.c" line="633"/>
+        <location filename="../file.c" line="678"/>
         <source>Mouth piece position CC</source>
         <translation>Pozycja ustnika: CC</translation>
     </message>
     <message>
-        <location filename="../file.c" line="637"/>
+        <location filename="../file.c" line="682"/>
         <source>Mouth piece position unknown</source>
         <translation>Pozycja ustnika: nieznana</translation>
     </message>
     <message>
-        <location filename="../file.c" line="641"/>
+        <location filename="../file.c" line="686"/>
         <source>Mouth piece position not connected</source>
         <translation>Pozycja ustnika: nie podłączony</translation>
     </message>
     <message>
-        <location filename="../file.c" line="647"/>
+        <location filename="../file.c" line="693"/>
         <source>Power off</source>
         <translation>Wyłączenie</translation>
     </message>
     <message>
-        <location filename="../file.c" line="707"/>
+        <location filename="../file.c" line="753"/>
         <source>O₂ calibration failed</source>
         <translation>Kalibracja O₂ nieudana</translation>
     </message>
     <message>
-        <location filename="../file.c" line="709"/>
-        <location filename="../file.c" line="718"/>
+        <location filename="../file.c" line="755"/>
+        <location filename="../file.c" line="764"/>
         <source>O₂ calibration</source>
         <translation>Kalibracja O₂ </translation>
     </message>
     <message>
-        <location filename="../file.c" line="785"/>
+        <location filename="../file.c" line="831"/>
         <source>No matching DC found for file &apos;%s&apos;</source>
         <translation>Nie znaleziono komputera nurkowego pasującego do pliku &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../file.c" line="870"/>
-        <location filename="../file.c" line="917"/>
-        <location filename="../file.c" line="1016"/>
-        <source>Maximum number of supported columns on CSV import is %d</source>
-        <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation>
-    </message>
-    <message>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>none</source>
         <translation>brak</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="305"/>
-        <location filename="../cochran.c" line="311"/>
-        <location filename="../cochran.c" line="381"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="306"/>
+        <location filename="../cochran.c" line="312"/>
+        <location filename="../cochran.c" line="382"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>deco stop</source>
         <translation>przystanek deco</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="338"/>
-        <location filename="../file.c" line="653"/>
+        <location filename="../cochran.c" line="339"/>
+        <location filename="../file.c" line="699"/>
         <source>battery</source>
         <translation>bateria</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="366"/>
-        <location filename="../cochran.c" line="405"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="367"/>
+        <location filename="../cochran.c" line="406"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>rbt</source>
         <translation>pozostały czas denny</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="332"/>
-        <location filename="../cochran.c" line="386"/>
-        <location filename="../file.c" line="675"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="333"/>
+        <location filename="../cochran.c" line="387"/>
+        <location filename="../file.c" line="721"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>ascent</source>
         <translation>wynurzanie</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="375"/>
-        <location filename="../cochran.c" line="422"/>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../cochran.c" line="376"/>
+        <location filename="../cochran.c" line="423"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>ceiling</source>
         <translation>sufit</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="120"/>
+        <location filename="../libdivecomputer.c" line="165"/>
         <source>workload</source>
         <translation>wysiłek</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="391"/>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../cochran.c" line="392"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>transmitter</source>
         <translation>nadajnik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>violation</source>
         <translation>naruszenie</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>bookmark</source>
         <translation>notatka</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>surface</source>
         <translation>powierzchnia</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="121"/>
+        <location filename="../libdivecomputer.c" line="166"/>
         <source>safety stop</source>
         <translation>przystanek bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="361"/>
-        <location filename="../cochran.c" line="410"/>
-        <location filename="../cochran.c" line="417"/>
-        <location filename="../file.c" line="766"/>
-        <location filename="../libdivecomputer.c" line="122"/>
-        <location filename="../libdivecomputer.c" line="125"/>
+        <location filename="../cochran.c" line="362"/>
+        <location filename="../cochran.c" line="411"/>
+        <location filename="../cochran.c" line="418"/>
+        <location filename="../file.c" line="812"/>
+        <location filename="../libdivecomputer.c" line="167"/>
+        <location filename="../libdivecomputer.c" line="170"/>
         <source>gaschange</source>
         <translation>zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="122"/>
+        <location filename="../libdivecomputer.c" line="167"/>
         <source>safety stop (voluntary)</source>
         <translation>przystanek bezpieczeństwa (opcjonalny)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="122"/>
+        <location filename="../libdivecomputer.c" line="167"/>
         <source>safety stop (mandatory)</source>
         <translation>przystanek bezpieczeństwa (obowiązkowy)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>ceiling (safety stop)</source>
         <translation>sufit (przystanek bezpieczeństwa)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>divetime</source>
         <translation>czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="123"/>
+        <location filename="../libdivecomputer.c" line="168"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>poniżej podłogi deco</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="349"/>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../cochran.c" line="350"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>maxdepth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="344"/>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../cochran.c" line="345"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>airtime</source>
         <translation>Pozostały czas oddychania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>heading</source>
         <translation>kierunek</translation>
     </message>
     <message>
-        <location filename="../cochran.c" line="354"/>
-        <location filename="../cochran.c" line="400"/>
-        <location filename="../libdivecomputer.c" line="124"/>
+        <location filename="../cochran.c" line="355"/>
+        <location filename="../cochran.c" line="401"/>
+        <location filename="../libdivecomputer.c" line="169"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="125"/>
+        <location filename="../libdivecomputer.c" line="170"/>
         <source>tissue level warning</source>
         <translation>Ostrzeżenie: poziom nasycenia tkanek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="125"/>
+        <location filename="../libdivecomputer.c" line="170"/>
         <source>non stop time</source>
         <translation>czas bezdekompresyjny</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="142"/>
+        <location filename="../libdivecomputer.c" line="187"/>
         <source>invalid event number</source>
         <translation>niepoprawny znacznik</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="419"/>
+        <location filename="../libdivecomputer.c" line="624"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nie udało się utworzyć parsera dla %s %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="425"/>
+        <location filename="../libdivecomputer.c" line="630"/>
         <source>Error registering the data</source>
         <translation>Błąd podczas przetwarzania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="433"/>
+        <location filename="../libdivecomputer.c" line="459"/>
         <source>Error parsing the datetime</source>
         <translation>Błąd podczas przetwarzania daty i czasu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="450"/>
+        <location filename="../libdivecomputer.c" line="477"/>
         <source>Dive %d: %s</source>
         <translation>Nurkowanie %d: %s</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="454"/>
+        <location filename="../libdivecomputer.c" line="483"/>
         <source>Error parsing the divetime</source>
         <translation>Błąd podczas przetwarzania czasu nurkowania</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="464"/>
+        <location filename="../libdivecomputer.c" line="493"/>
         <source>Error parsing the maxdepth</source>
         <translation>Błąd podczas przetwarzania głębokości</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="483"/>
+        <location filename="../libdivecomputer.c" line="512"/>
         <source>Error parsing temperature</source>
         <translation>Błąd przy przetwarzaniu temperatury</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="503"/>
+        <location filename="../libdivecomputer.c" line="532"/>
         <source>Error parsing the gas mix count</source>
         <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="515"/>
+        <location filename="../libdivecomputer.c" line="544"/>
         <source>Error obtaining water salinity</source>
         <translation>Błąd podczas przetwarzania danych o zasoleniu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="524"/>
+        <location filename="../libdivecomputer.c" line="553"/>
         <source>Error obtaining surface pressure</source>
         <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="549"/>
+        <location filename="../libdivecomputer.c" line="578"/>
         <source>Error obtaining divemode</source>
         <translation>Błąd odczytywania trybu pracy komputera nurkowego </translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="569"/>
+        <location filename="../libdivecomputer.c" line="598"/>
         <source>Error parsing the gas mix</source>
         <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="576"/>
+        <location filename="../libdivecomputer.c" line="650"/>
         <source>Error parsing the samples</source>
         <translation>Błąd podczas przetwarzania próbek</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="713"/>
+        <location filename="../libdivecomputer.c" line="787"/>
         <source>Event: waiting for user action</source>
         <translation>Oczekiwanie na działanie użytkownika</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="721"/>
+        <location filename="../libdivecomputer.c" line="795"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="785"/>
+        <location filename="../libdivecomputer.c" line="859"/>
         <source>Error registering the event handler.</source>
         <translation>Błąd rejestracji uchwytu (event handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="790"/>
+        <location filename="../libdivecomputer.c" line="864"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Błąd rejestracji uchwytu (cancellation handler)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="811"/>
+        <location filename="../libdivecomputer.c" line="885"/>
         <source>Dive data import error</source>
         <translation>Błąd podczas importowania danych</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="850"/>
+        <location filename="../libdivecomputer.c" line="924"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nie można utworzyć kontekstu libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="857"/>
+        <location filename="../libdivecomputer.c" line="931"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nie udało się otworzyć %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../libdivecomputer.c" line="865"/>
+        <location filename="../libdivecomputer.c" line="958"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Brak uprawnień by otworzyć urządzenie %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="516"/>
+        <location filename="../parse-xml.c" line="522"/>
         <source>Strange percentage reading %s
 </source>
         <translation>Podejrzany skład procentowy %s
 </translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="1770"/>
-        <source>Failed to parse &apos;%s&apos;</source>
-        <translation>Nie udało się przetworzyć &apos;%s&apos;</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="1999"/>
-        <location filename="../parse-xml.c" line="2147"/>
-        <source>Database query dm4_events failed.
-</source>
-        <translation>Zapytanie bazy danych o dm4_events nie powiodło się.
-
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2006"/>
-        <location filename="../parse-xml.c" line="2154"/>
-        <source>Database query dm4_tags failed.
-</source>
-        <translation>Zapytanie bazy danych o dm4_tags nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2328"/>
-        <source>Database query shearwater_cylinders failed.
-</source>
-        <translation>Zapytanie bazy danych o shearwater_cylinders nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2335"/>
-        <source>Database query shearwater_changes failed.
-</source>
-        <translation>Zapytanie bazy danych o shearwater_changes  nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2342"/>
-        <source>Database query shearwater_profile_sample failed.
-</source>
-        <translation>Zapytanie bazy danych o shearwater_profile_sample nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2461"/>
-        <source>Database query cobalt_cylinders failed.
-</source>
-        <translation>Zapytanie bazy danych o cobalt_cylinders nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2468"/>
-        <source>Database query cobalt_buddies failed.
-</source>
-        <translation>Zapytanie bazy danych o cobalt_buddies nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2475"/>
-        <source>Database query cobalt_visibility failed.
-</source>
-        <translation>Zapytanie bazy danych o cobalt_visibility nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2482"/>
-        <source>Database query cobalt_location failed.
-</source>
-        <translation>Zapytanie bazy danych o cobalt_location nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2489"/>
-        <source>Database query cobalt_location (site) failed.
-</source>
-        <translation>Zapytanie bazy danych o cobalt_location (site) nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../parse-xml.c" line="2496"/>
-        <source>Database query cobalt_profile_sample failed.
-</source>
-        <translation>Zapytanie bazy danych o cobalt_profile_sample nie powiodło się.
-</translation>
-    </message>
-    <message>
-        <location filename="../file.c" line="174"/>
-        <source>Database connection failed '%s'.
+        <location filename="../parse-xml.c" line="1240"/>
+        <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation>Błąd połączenia z bazą danych &apos;%s&apos;.⏎
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2178"/>
-        <location filename="../parse-xml.c" line="2199"/>
-        <location filename="../parse-xml.c" line="2518"/>
-        <location filename="../parse-xml.c" line="2537"/>
-        <source>Database query failed '%s'.
-</source>
-        <translation>Błąd komunikacji z bazą danych &apos;%s&apos;.
-</translation>
+        <location filename="../parse-xml.c" line="2026"/>
+        <source>Failed to parse &apos;%s&apos;</source>
+        <translation>Nie udało się przetworzyć &apos;%s&apos;</translation>
     </message>
     <message>
-        <location filename="../parse-xml.c" line="2909"/>
+        <location filename="../parse-xml.c" line="3619"/>
         <source>Can&apos;t open stylesheet %s</source>
         <translation>Nie można otworzyć arkusza stylów %s</translation>
     </message>
@@ -6075,12 +7810,13 @@ Maximum</source>
         <translation>EAN%d</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="841"/>
+        <location filename="../planner.c" line="990"/>
+        <location filename="../planner.c" line="1139"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Nie można znaleźć gazu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="363"/>
+        <location filename="../planner.c" line="341"/>
         <source>Too many gas mixes</source>
         <translation>Zbyt wiele rodzajów gazu</translation>
     </message>
@@ -6090,147 +7826,163 @@ Maximum</source>
         <translation>Obliczanie dekompresji przerwane z powodu zbyt długiego czasu.</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="548"/>
-        <source>based on GFlow = %d and GFhigh = %d</source>
-        <translation>w oparciu o GFlow = %d i GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../planner.c" line="551"/>
+        <location filename="../planner.c" line="564"/>
         <source>Subsurface dive plan</source>
         <translation>Plan nurkowania Subsurface </translation>
     </message>
     <message>
-        <location filename="../planner.c" line="555"/>
+        <location filename="../planner.c" line="568"/>
         <source>depth</source>
         <translation>głębokość</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="558"/>
+        <location filename="../planner.c" line="574"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="561"/>
+        <location filename="../planner.c" line="571"/>
         <source>duration</source>
         <translation>czas trwania</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="564"/>
+        <location filename="../planner.c" line="526"/>
+        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="552"/>
+        <source>based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="560"/>
+        <source>recreational mode based on Buhlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="577"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="601"/>
+        <location filename="../planner.c" line="620"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="609"/>
+        <location filename="../planner.c" line="628"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="622"/>
+        <location filename="../planner.c" line="641"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="629"/>
+        <location filename="../planner.c" line="648"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="642"/>
+        <location filename="../planner.c" line="681"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="645"/>
-        <location filename="../planner.c" line="649"/>
+        <location filename="../planner.c" line="684"/>
+        <location filename="../planner.c" line="688"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="658"/>
+        <location filename="../planner.c" line="697"/>
+        <location filename="../planner.c" line="709"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="683"/>
+        <location filename="../planner.c" line="732"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Zmiana gazu na %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="685"/>
+        <location filename="../planner.c" line="734"/>
         <source>Switch gas to %s</source>
         <translation>Zmiana gazu na %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="704"/>
+        <location filename="../planner.c" line="752"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="706"/>
+        <location filename="../planner.c" line="754"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="710"/>
+        <location filename="../planner.c" line="758"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Zużycie gazu (nie uwzględnia CCR):</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="712"/>
+        <location filename="../planner.c" line="760"/>
         <source>Gas consumption:</source>
         <translation>Zużycie gazu:</translation>
     </message>
     <message>
         <location filename="../planner.c" line="542"/>
-        <location filename="../planner.c" line="732"/>
-        <location filename="../planner.c" line="737"/>
-        <location filename="../planner.c" line="762"/>
-        <location filename="../planner.c" line="772"/>
+        <location filename="../planner.c" line="780"/>
+        <location filename="../planner.c" line="785"/>
+        <location filename="../planner.c" line="810"/>
+        <location filename="../planner.c" line="820"/>
         <source>Warning:</source>
         <translation>Ostrzeżenie:</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="530"/>
-        <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
-        <translation>OSTRZEŻENIE: TEN PLANER POSŁUGUJE SIĘ IMPLEMENTACJĄ ALGORYTMU BUHLMANNA, KTÓRA JEST NOWA I ZOSTAŁA PRZETESTOWANA W BARDZO OGRANICZONYM ZAKRESIE. ZDECYDOWANIE ODRADZAMY PLANOWANIE NURKOWANIA JEDYNIE W OPARCIU O REZULTATY DZIAŁANIA TEGO PROGRAMU.</translation>
+        <location filename="../planner.c" line="556"/>
+        <source>based on VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../planner.c" line="733"/>
+        <location filename="../planner.c" line="558"/>
+        <source>based on VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../planner.c" line="781"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>to więcej gazu niż masz w dostępnych butlach!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="738"/>
+        <location filename="../planner.c" line="786"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="740"/>
+        <location filename="../planner.c" line="788"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s gazu %s (%.0f%s/%.0f%s podczas wynurzania)</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="742"/>
+        <location filename="../planner.c" line="790"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s podczas wynurzania) gazu %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="759"/>
+        <location filename="../planner.c" line="807"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="769"/>
+        <location filename="../planner.c" line="817"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>niska wartość pO₂ %.2f o %d:%02u gaz %s na głębokości %.*f %s</translation>
     </message>
     <message>
-        <location filename="../planner.c" line="1085"/>
+        <location filename="../planner.c" line="1373"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
@@ -6403,208 +8155,385 @@ EADD: %d%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1202"/>
+        <location filename="../profile.c" line="1201"/>
+        <source>RBT: %umin
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../profile.c" line="1204"/>
         <source>Calculated ceiling %.0f%s
 </source>
         <translation>Obliczony sufit:  %.0f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
-        <source>Tissue %.0fmin: %.0f%s
+        <location filename="../profile.c" line="1210"/>
+        <source>Tissue %.0fmin: %.1f%s
 </source>
-        <translation>Tkanka %.0fmin: %.0f%s
-</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1214"/>
+        <location filename="../profile.c" line="1216"/>
         <source>heartbeat: %d
 </source>
         <translation>tętno: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1216"/>
+        <location filename="../profile.c" line="1218"/>
         <source>bearing: %d
 </source>
         <translation>kurs: %d
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1221"/>
         <source>mean depth to here %.1f%s
 </source>
         <translation>gł. średnia do teraz %.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1314"/>
+        <location filename="../profile.c" line="1316"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1318"/>
-        <location filename="../profile.c" line="1322"/>
-        <location filename="../profile.c" line="1326"/>
+        <location filename="../profile.c" line="1320"/>
+        <location filename="../profile.c" line="1324"/>
+        <location filename="../profile.c" line="1328"/>
         <source>%s %sD:%.1f%s</source>
         <translation>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1330"/>
+        <location filename="../profile.c" line="1332"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1334"/>
+        <location filename="../profile.c" line="1336"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1338"/>
-        <location filename="../profile.c" line="1342"/>
+        <location filename="../profile.c" line="1340"/>
+        <location filename="../profile.c" line="1344"/>
         <source>%s %sV:%.2f%s</source>
         <translation>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1349"/>
+        <location filename="../profile.c" line="1351"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="298"/>
+        <location filename="../qthelper.cpp" line="309"/>
+        <source>%1km</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="311"/>
+        <source>%1m</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="315"/>
+        <source>%1mi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="317"/>
+        <source>%1yd</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qthelper.cpp" line="853"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="301"/>
+        <location filename="../qthelper.cpp" line="856"/>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="460"/>
+        <location filename="../qthelper.cpp" line="1009"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="465"/>
+        <location filename="../qthelper.cpp" line="1014"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 nurkowanie)</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="22"/>
         <source>boat</source>
         <translation>z łodzi</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../dive.c" line="22"/>
         <source>shore</source>
         <translation>z brzegu</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="20"/>
+        <location filename="../datatrak.c" line="451"/>
+        <location filename="../dive.c" line="22"/>
         <source>drift</source>
         <translation>dryf</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="23"/>
         <source>deep</source>
         <translation>głębokie</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../dive.c" line="23"/>
         <source>cavern</source>
         <translation>kawerna</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="21"/>
+        <location filename="../datatrak.c" line="435"/>
+        <location filename="../dive.c" line="23"/>
         <source>ice</source>
         <translation>podlodowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../datatrak.c" line="437"/>
+        <source>search</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="447"/>
+        <location filename="../dive.c" line="24"/>
         <source>wreck</source>
         <translation>wrakowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../datatrak.c" line="433"/>
+        <location filename="../dive.c" line="24"/>
         <source>cave</source>
         <translation>jaskiniowe</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="22"/>
+        <location filename="../dive.c" line="24"/>
         <source>altitude</source>
         <translation>wysokość</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="25"/>
         <source>pool</source>
         <translation>basen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../dive.c" line="25"/>
         <source>lake</source>
         <translation>jezioro</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="23"/>
+        <location filename="../datatrak.c" line="449"/>
+        <location filename="../dive.c" line="25"/>
         <source>river</source>
         <translation>rzeka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../datatrak.c" line="431"/>
+        <location filename="../dive.c" line="26"/>
         <source>night</source>
         <translation>nocne</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../datatrak.c" line="145"/>
+        <source>Error: the file does not appear to be a DATATRAK divelog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="278"/>
+        <source>clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="281"/>
+        <source>misty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="284"/>
+        <source>fog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="287"/>
+        <source>rain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="290"/>
+        <source>storm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="293"/>
+        <source>snow</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="313"/>
+        <source>No suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="316"/>
+        <source>Shorty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="319"/>
+        <source>Combi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="322"/>
+        <source>Wet suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="325"/>
+        <source>Semidry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="328"/>
+        <source>Dry suit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="388"/>
+        <source>no stop</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="392"/>
+        <source>single ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="394"/>
+        <source>multiple ascent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="396"/>
+        <location filename="../dive.c" line="26"/>
         <source>fresh</source>
         <translation>słodka</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="24"/>
+        <location filename="../datatrak.c" line="398"/>
+        <source>salt water</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="423"/>
+        <source>sight seeing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="425"/>
+        <source>club dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="429"/>
+        <source>instruction</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="455"/>
+        <source>other</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="466"/>
+        <source>Other activities</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="490"/>
+        <source>Datatrak/Wlog notes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="529"/>
+        <source>Manually entered dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="580"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="662"/>
+        <source>Error: couldn&apos;t open the file %s</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../datatrak.c" line="675"/>
+        <source>Error: no dive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../dive.c" line="26"/>
         <source>student</source>
         <translation>uczeń</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../datatrak.c" line="453"/>
+        <location filename="../dive.c" line="27"/>
         <source>photo</source>
         <translation>fotografia</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../dive.c" line="27"/>
         <source>video</source>
         <translation>video</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="25"/>
+        <location filename="../datatrak.c" line="427"/>
+        <location filename="../dive.c" line="27"/>
         <source>instructor</source>
         <translation>instruktor</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="26"/>
+        <location filename="../datatrak.c" line="390"/>
+        <location filename="../dive.c" line="28"/>
         <source>deco</source>
         <translation>deco</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="30"/>
+        <location filename="../dive.c" line="32"/>
         <source>OC-gas</source>
         <translation>gaz OC</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="30"/>
+        <location filename="../dive.c" line="32"/>
         <source>diluent</source>
         <translation>diluent</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="30"/>
+        <location filename="../dive.c" line="32"/>
         <location filename="../equipment.c" line="85"/>
+        <location filename="../planner.c" line="1369"/>
+        <location filename="../planner.c" line="1372"/>
         <source>oxygen</source>
         <translation>tlen</translation>
     </message>
     <message>
-        <location filename="../dive.c" line="237"/>
+        <location filename="../dive.c" line="239"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
@@ -6654,117 +8583,119 @@ EADD: %d%s
         <translation>(brak nurkowań)</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Mon</source>
         <translation>Pon</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Tue</source>
         <translation>Wto</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Wed</source>
         <translation>Śro</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Thu</source>
         <translation>Czw</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="91"/>
+        <location filename="../subsurfacestartup.c" line="111"/>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Jan</source>
         <translation>Sty</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Feb</source>
         <translation>Lut</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Apr</source>
         <translation>Kwi</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="100"/>
+        <location filename="../subsurfacestartup.c" line="120"/>
         <source>Jun</source>
         <translation>Cze</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Jul</source>
         <translation>Lip</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Aug</source>
         <translation>Sie</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Sep</source>
         <translation>Wrz</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
-        <location filename="../subsurfacestartup.c" line="101"/>
+        <location filename="../subsurfacestartup.c" line="121"/>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="111"/>
+        <location filename="../libdivecomputer.c" line="154"/>
+        <location filename="../parse-xml.c" line="3182"/>
+        <location filename="../uemis-downloader.c" line="124"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="431"/>
+        <location filename="../uemis-downloader.c" line="455"/>
         <source>data</source>
         <translation>dane</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="411"/>
+        <location filename="../uemis-downloader.c" line="435"/>
         <source>%s %s</source>
         <translation>%s %s</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="24"/>
+        <location filename="../uemis-downloader.c" line="27"/>
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
@@ -6773,461 +8704,459 @@ Odłącz i podłącz ponownie komputer nurkowy
 i wybierz &apos;Ponów&apos;</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="25"/>
+        <location filename="../uemis-downloader.c" line="28"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
-and try again</source>
-        <translation>Uemis Zurich: System plików jest pełen
-Odłącz i podłącz ponownie komputer nurkowy
-i spróbuj jeszcze raz.</translation>
+and click Retry</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="26"/>
+        <location filename="../uemis-downloader.c" line="29"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
         <translation>Nieudany zapis do pliku req.txt 
 Czy Uemis Zurich jest podłączony poprawnie?</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="452"/>
+        <location filename="../uemis-downloader.c" line="483"/>
         <source>divelog #</source>
         <translation>log #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="454"/>
+        <location filename="../uemis-downloader.c" line="485"/>
         <source>divespot #</source>
         <translation>miejsce nurkowe #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="456"/>
+        <location filename="../uemis-downloader.c" line="487"/>
         <source>details for #</source>
         <translation>szczegóły dla #</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="650"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>wetsuit</source>
         <translation>mokry</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="650"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>semidry</source>
         <translation>półsuchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="650"/>
+        <location filename="../uemis-downloader.c" line="697"/>
         <source>drysuit</source>
         <translation>suchy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>shorty</source>
         <translation>krótki</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>vest</source>
         <translation>kamizelka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>long john</source>
         <translation>długi</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>jacket</source>
         <translation>kurtka</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>full suit</source>
         <translation>pełna</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="651"/>
+        <location filename="../uemis-downloader.c" line="698"/>
         <source>2 pcs full suit</source>
         <translation>pełna dwuczęściowa</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="652"/>
+        <location filename="../uemis-downloader.c" line="699"/>
         <source>membrane</source>
         <translation>membranowy</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="853"/>
+        <location filename="../uemis-downloader.c" line="1064"/>
         <source>Initialise communication</source>
         <translation>Nawiązywanie łączności</translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="855"/>
+        <location filename="../uemis-downloader.c" line="1067"/>
         <source>Uemis init failed</source>
         <translation>Błąd inicjalizacji Uemis </translation>
     </message>
     <message>
-        <location filename="../uemis-downloader.c" line="866"/>
+        <location filename="../uemis-downloader.c" line="1079"/>
         <source>Start download</source>
         <translation>Rozpocznij pobieranie</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="196"/>
+        <location filename="../uemis.c" line="189"/>
         <source>Safety stop violation</source>
         <translation>Pominięcie przystanku bezpieczeństwa</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="198"/>
+        <location filename="../uemis.c" line="191"/>
         <source>Speed alarm</source>
         <translation>Alarm prędkości wynurzania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="201"/>
+        <location filename="../uemis.c" line="194"/>
         <source>Speed warning</source>
         <translation>Ostrzeżenie: prędkość wynurzania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="203"/>
+        <location filename="../uemis.c" line="196"/>
         <source>pO₂ green warning</source>
         <translation>Ostrzeżenie: pO₂ zielone</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="206"/>
+        <location filename="../uemis.c" line="199"/>
         <source>pO₂ ascend warning</source>
         <translation>Ostrzeżenie: wynurzanie / pO₂ </translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="208"/>
+        <location filename="../uemis.c" line="201"/>
         <source>pO₂ ascend alarm</source>
         <translation>Alarm: wynurzanie / pO₂</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="212"/>
+        <location filename="../uemis.c" line="205"/>
         <source>Tank pressure info</source>
         <translation>Ciśnienie w butli</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="214"/>
+        <location filename="../uemis.c" line="207"/>
         <source>RGT warning</source>
         <translation>Ostrzeżenie: ilość gazu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="216"/>
+        <location filename="../uemis.c" line="209"/>
         <source>RGT alert</source>
         <translation>Alarm: ilość gazu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="218"/>
+        <location filename="../uemis.c" line="211"/>
         <source>Tank change suggested</source>
         <translation>Zalecana zmiana gazu</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="220"/>
+        <location filename="../uemis.c" line="213"/>
         <source>Depth limit exceeded</source>
         <translation>Przekroczenie limitu głębokości</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="222"/>
+        <location filename="../uemis.c" line="215"/>
         <source>Max deco time warning</source>
         <translation>Ostrzeżenie: maksymalny czas dekompresji</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="224"/>
+        <location filename="../uemis.c" line="217"/>
         <source>Dive time info</source>
         <translation>Informacja: czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="226"/>
+        <location filename="../uemis.c" line="219"/>
         <source>Dive time alert</source>
         <translation>Alarm: czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="228"/>
+        <location filename="../uemis.c" line="221"/>
         <source>Marker</source>
         <translation>Znacznik</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="230"/>
+        <location filename="../uemis.c" line="223"/>
         <source>No tank data</source>
         <translation>Brak danych o butli</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="232"/>
+        <location filename="../uemis.c" line="225"/>
         <source>Low battery warning</source>
         <translation>Ostrzeżenie: niski poziom baterii</translation>
     </message>
     <message>
-        <location filename="../uemis.c" line="234"/>
+        <location filename="../uemis.c" line="227"/>
         <source>Low battery alert</source>
         <translation>Alarm: niski poziom baterii</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="434"/>
-        <location filename="../save-html.c" line="517"/>
-        <location filename="../worldmap-save.c" line="106"/>
+        <location filename="../save-html.c" line="443"/>
+        <location filename="../save-html.c" line="527"/>
+        <location filename="../worldmap-save.c" line="108"/>
         <source>Can&apos;t open file %s</source>
         <translation>Nie można otworzyć pliku %s</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="452"/>
+        <location filename="../save-html.c" line="462"/>
         <source>Number</source>
         <translation>Numer</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="453"/>
+        <location filename="../save-html.c" line="463"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="454"/>
+        <location filename="../save-html.c" line="464"/>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="455"/>
+        <location filename="../save-html.c" line="465"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="456"/>
+        <location filename="../save-html.c" line="466"/>
         <source>Air temp.</source>
         <translation>Temp. powietrza</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="457"/>
+        <location filename="../save-html.c" line="467"/>
         <source>Water temp.</source>
         <translation>Temp. wody</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="462"/>
+        <location filename="../save-html.c" line="472"/>
         <source>Statistics</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="466"/>
+        <location filename="../save-html.c" line="476"/>
         <source>Rating</source>
         <translation>Ocena</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="467"/>
+        <location filename="../save-html.c" line="477"/>
         <source>Visibility</source>
         <translation>Widzialność</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="468"/>
+        <location filename="../save-html.c" line="478"/>
         <source>Duration</source>
         <translation>Czas trwania</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="458"/>
+        <location filename="../save-html.c" line="468"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="459"/>
+        <location filename="../save-html.c" line="469"/>
         <source>Expand all</source>
         <translation>Rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="460"/>
+        <location filename="../save-html.c" line="470"/>
         <source>Collapse all</source>
         <translation>Zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="461"/>
+        <location filename="../save-html.c" line="471"/>
         <source>Trips</source>
         <translation>Grupy</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="463"/>
+        <location filename="../save-html.c" line="473"/>
         <source>Advanced search</source>
         <translation>Wyszukiwanie zaawansowane</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="469"/>
+        <location filename="../save-html.c" line="479"/>
         <source>Divemaster</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="470"/>
+        <location filename="../save-html.c" line="480"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="471"/>
+        <location filename="../save-html.c" line="481"/>
         <source>Suit</source>
         <translation>Skafander</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="472"/>
+        <location filename="../save-html.c" line="482"/>
         <source>Tags</source>
         <translation>Tagi</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="473"/>
+        <location filename="../save-html.c" line="483"/>
         <source>Notes</source>
         <translation>Opis</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="474"/>
+        <location filename="../save-html.c" line="484"/>
         <source>Show more details</source>
         <translation>Pokaż więcej szczegółów</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="477"/>
+        <location filename="../save-html.c" line="487"/>
         <source>Yearly statistics</source>
         <translation>Statystyka roczna</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="478"/>
+        <location filename="../save-html.c" line="488"/>
         <source>Year</source>
         <translation>Rok</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="479"/>
+        <location filename="../save-html.c" line="489"/>
         <source>Total time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="480"/>
+        <location filename="../save-html.c" line="490"/>
         <source>Average time</source>
         <translation>Średnia długość</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="481"/>
+        <location filename="../save-html.c" line="491"/>
         <source>Shortest time</source>
         <translation>Najmniejsza długość</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="482"/>
+        <location filename="../save-html.c" line="492"/>
         <source>Longest time</source>
         <translation>Największa długość</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="483"/>
+        <location filename="../save-html.c" line="493"/>
         <source>Average depth</source>
         <translation>Średnia głębokość</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="484"/>
+        <location filename="../save-html.c" line="494"/>
         <source>Min. depth</source>
         <translation>Min głębokość </translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="485"/>
+        <location filename="../save-html.c" line="495"/>
         <source>Max. depth</source>
         <translation>Maks. głębokość</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="487"/>
+        <location filename="../save-html.c" line="497"/>
         <source>Min. SAC</source>
         <translation>Min SAC</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="488"/>
+        <location filename="../save-html.c" line="498"/>
         <source>Max. SAC</source>
         <translation>Max SAC</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="489"/>
+        <location filename="../save-html.c" line="499"/>
         <source>Average temp.</source>
         <translation>Średnia temperatura </translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="490"/>
+        <location filename="../save-html.c" line="500"/>
         <source>Min. temp.</source>
         <translation>Min. temp.</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="491"/>
+        <location filename="../save-html.c" line="501"/>
         <source>Max. temp.</source>
         <translation>Max. temp.</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="492"/>
+        <location filename="../save-html.c" line="502"/>
         <source>Back to list</source>
         <translation>Powrót do listy</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="498"/>
+        <location filename="../save-html.c" line="508"/>
         <source>Dive equipment</source>
         <translation>Wyposażenie</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="501"/>
+        <location filename="../save-html.c" line="511"/>
         <source>Work pressure</source>
         <translation>Ciśnienie robocze</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="502"/>
+        <location filename="../save-html.c" line="512"/>
         <source>Start pressure</source>
         <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="503"/>
+        <location filename="../save-html.c" line="513"/>
         <source>End pressure</source>
         <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="511"/>
+        <location filename="../save-html.c" line="521"/>
         <source>Dive status</source>
         <translation>Status nurkowania</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="486"/>
+        <location filename="../save-html.c" line="496"/>
         <source>Average SAC</source>
         <translation>Średni SAC</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="495"/>
+        <location filename="../save-html.c" line="505"/>
         <source>Dive No.</source>
         <translation>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="496"/>
+        <location filename="../save-html.c" line="506"/>
         <source>Dive profile</source>
         <translation>Profil</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="497"/>
+        <location filename="../save-html.c" line="507"/>
         <source>Dive information</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="499"/>
-        <location filename="../save-html.c" line="506"/>
+        <location filename="../save-html.c" line="509"/>
+        <location filename="../save-html.c" line="516"/>
         <source>Type</source>
         <translation>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="500"/>
+        <location filename="../save-html.c" line="510"/>
         <source>Size</source>
         <translation>Pojemność</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="504"/>
+        <location filename="../save-html.c" line="514"/>
         <source>Gas</source>
         <translation>Gaz</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="505"/>
+        <location filename="../save-html.c" line="515"/>
         <source>Weight</source>
         <translation>Balast</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="507"/>
+        <location filename="../save-html.c" line="517"/>
         <source>Events</source>
         <translation>Zdarzenia</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="508"/>
+        <location filename="../save-html.c" line="518"/>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="509"/>
+        <location filename="../save-html.c" line="519"/>
         <source>Value</source>
         <translation>Wartość</translation>
     </message>
     <message>
-        <location filename="../save-html.c" line="510"/>
+        <location filename="../save-html.c" line="520"/>
         <source>Coordinates</source>
         <translation>Współrzędne</translation>
     </message>
@@ -7257,216 +9186,453 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation>
         <translation>Maks. głębokość:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="46"/>
+        <location filename="../worldmap-save.c" line="47"/>
         <source>Air temp.:</source>
         <translation>Temp. powietrza:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="48"/>
+        <location filename="../worldmap-save.c" line="50"/>
         <source>Water temp.:</source>
         <translation>Temp. wody:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="50"/>
+        <location filename="../worldmap-save.c" line="52"/>
         <source>Location:</source>
         <translation>Miejsce:</translation>
     </message>
     <message>
-        <location filename="../worldmap-save.c" line="54"/>
+        <location filename="../worldmap-save.c" line="56"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="46"/>
-        <location filename="../qthelper.cpp" line="73"/>
+        <location filename="../qthelper.cpp" line="333"/>
+        <location filename="../qthelper.cpp" line="461"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="46"/>
-        <location filename="../qthelper.cpp" line="74"/>
+        <location filename="../qthelper.cpp" line="333"/>
+        <location filename="../qthelper.cpp" line="462"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="47"/>
-        <location filename="../qthelper.cpp" line="75"/>
+        <location filename="../qthelper.cpp" line="334"/>
+        <location filename="../qthelper.cpp" line="463"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qthelper.cpp" line="47"/>
-        <location filename="../qthelper.cpp" line="76"/>
+        <location filename="../qthelper.cpp" line="334"/>
+        <location filename="../qthelper.cpp" line="464"/>
         <source>W</source>
         <translation>W</translation>
     </message>
+    <message>
+        <location filename="../git-access.c" line="206"/>
+        <location filename="../git-access.c" line="210"/>
+        <source>Remote storage and local data diverged. Error: can&apos;t get commit (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="208"/>
+        <source>Remote storage and local data diverged. Error: failed local tree lookup (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="212"/>
+        <source>Remote storage and local data diverged. Error: failed remote tree lookup (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="214"/>
+        <source>Remote storage and local data diverged. Error: can&apos;t get commit: (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="216"/>
+        <source>Remote storage and local data diverged. Error: failed base tree lookup: (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="218"/>
+        <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="247"/>
+        <source>Remote storage and local data diverged. Error: merge conflict - manual intervention needed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="255"/>
+        <source>Remote storage and local data diverged. Error: writing the tree failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="257"/>
+        <source>Remote storage and local data diverged. Error: tree lookup failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="259"/>
+        <source>Failed to get author: (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="261"/>
+        <source>Remote storage and local data diverged. Error: git commit create failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="263"/>
+        <source>Error: could not lookup the merge commit I just created (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="506"/>
+        <source>Error connecting to Subsurface cloud storage</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../git-access.c" line="509"/>
+        <source>git clone of %s failed (%s)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../load-git.c" line="189"/>
+        <source>multiple gps locations for this dive site; also %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../load-git.c" line="216"/>
+        <location filename="../parse-xml.c" line="1302"/>
+        <source>additional name for site: %s
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../ostctools.c" line="122"/>
+        <location filename="../ostctools.c" line="154"/>
+        <source>Unknown DC in dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../ostctools.c" line="167"/>
+        <source>Error - %s - parsing dive %d</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../qt-mobile/main.qml" line="11"/>
+        <location filename="../qt-mobile/main.qml" line="96"/>
+        <source>Subsurface mobile</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>plannerDetails</name>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="14"/>
+        <location filename="../build/ui_plannerDetails.h" line="90"/>
+        <source>Form</source>
+        <translation>Formularz</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="43"/>
+        <location filename="../build/ui_plannerDetails.h" line="91"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dive plan details&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Plan nurkowy&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="../build/ui_plannerDetails.h" line="92"/>
+        <source>Print</source>
+        <translation>Drukuj</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerDetails.ui" line="92"/>
+        <location filename="../build/ui_plannerDetails.h" line="93"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Courier&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;.Curier New&apos;;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
 </context>
 <context>
     <name>plannerSettingsWidget</name>
     <message>
         <location filename="../qt-ui/plannerSettings.ui" line="14"/>
+        <location filename="../build/ui_plannerSettings.h" line="420"/>
         <source>Form</source>
         <translation>Formularz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="56"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="74"/>
+        <location filename="../build/ui_plannerSettings.h" line="421"/>
         <source>Rates</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="77"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="95"/>
+        <location filename="../build/ui_plannerSettings.h" line="422"/>
         <source>Ascent</source>
         <translation>Wynurzania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="98"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="104"/>
+        <location filename="../build/ui_plannerSettings.h" line="423"/>
         <source>below 75% avg. depth</source>
         <translation>poniżej 75% śr. głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="105"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="122"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="139"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="156"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="202"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="111"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="128"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="145"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="162"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="206"/>
+        <location filename="../build/ui_plannerSettings.h" line="424"/>
+        <location filename="../build/ui_plannerSettings.h" line="426"/>
+        <location filename="../build/ui_plannerSettings.h" line="428"/>
+        <location filename="../build/ui_plannerSettings.h" line="430"/>
+        <location filename="../build/ui_plannerSettings.h" line="432"/>
         <source>m/min</source>
         <translation>m/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="169"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="175"/>
+        <location filename="../build/ui_plannerSettings.h" line="431"/>
         <source>Descent</source>
         <translation>Zanurzania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="221"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="187"/>
+        <location filename="../build/ui_plannerSettings.h" line="433"/>
         <source>surface to the bottom</source>
         <translation>od powierzchni do dna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="247"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="240"/>
+        <location filename="../build/ui_plannerSettings.h" line="434"/>
         <source>Planning</source>
         <translation>Planowanie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="281"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="261"/>
+        <source>VPM-B deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
+        <source>Buehlmann deco</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="278"/>
+        <location filename="../build/ui_plannerSettings.h" line="445"/>
+        <source>Reserve gas</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="320"/>
+        <location filename="../build/ui_plannerSettings.h" line="449"/>
+        <source>Postpone gas change if a stop is not required</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="323"/>
+        <location filename="../build/ui_plannerSettings.h" line="451"/>
+        <source>Only switch at required stops</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="343"/>
+        <location filename="../build/ui_plannerSettings.h" line="442"/>
         <source>GF low</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="268"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="322"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="307"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
+        <location filename="../build/ui_plannerSettings.h" line="437"/>
+        <location filename="../build/ui_plannerSettings.h" line="440"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="360"/>
+        <location filename="../build/ui_plannerSettings.h" line="435"/>
         <source>GF high</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="335"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="426"/>
+        <location filename="../build/ui_plannerSettings.h" line="441"/>
         <source>Drop to first depth</source>
         <translation>Spadnij do pierwszej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="315"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="389"/>
+        <location filename="../build/ui_plannerSettings.h" line="438"/>
         <source>Last stop at 6m</source>
         <translation>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="295"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="353"/>
+        <location filename="../build/ui_plannerSettings.h" line="436"/>
         <source>Plan backgas breaks</source>
         <translation>Przerwy powietrzne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="355"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="512"/>
+        <location filename="../build/ui_plannerSettings.h" line="455"/>
         <source>Gas options</source>
         <translation>Ustawienia gazu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="376"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="591"/>
+        <location filename="../build/ui_plannerSettings.h" line="456"/>
         <source>Bottom SAC</source>
         <translation>SAC przy dnie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="383"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="689"/>
+        <location filename="../build/ui_plannerSettings.h" line="457"/>
         <source>Deco SAC</source>
         <translation>Deco SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="390"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="598"/>
+        <location filename="../build/ui_plannerSettings.h" line="458"/>
         <source>Bottom pO₂</source>
         <translation>pO₂ przy dnie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="413"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="682"/>
+        <location filename="../build/ui_plannerSettings.h" line="460"/>
         <source>Deco pO₂</source>
         <translation>pO₂ podczas deco</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="449"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="462"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="562"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="669"/>
+        <location filename="../build/ui_plannerSettings.h" line="462"/>
+        <location filename="../build/ui_plannerSettings.h" line="463"/>
         <source>ℓ/min</source>
         <translation>ℓ/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="478"/>
-        <source>Dive notes</source>
-        <translation>Notatki</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="502"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="629"/>
+        <location filename="../build/ui_plannerSettings.h" line="468"/>
         <source>Display runtime</source>
         <translation>Pokazuj runtime</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="518"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="642"/>
+        <location filename="../build/ui_plannerSettings.h" line="472"/>
         <source>Display segment duration</source>
         <translation>Pokazuj czas trwania segmentu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="531"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="652"/>
+        <location filename="../build/ui_plannerSettings.h" line="476"/>
         <source>Display transitions in deco</source>
         <translation>Pokazuj przejścia między przystankami</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="538"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="659"/>
+        <location filename="../build/ui_plannerSettings.h" line="477"/>
         <source>Verbatim dive plan</source>
         <translation>Plan opisowy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="397"/>
-        <location filename="../qt-ui/plannerSettings.ui" line="420"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="288"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="546"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="575"/>
+        <location filename="../build/ui_plannerSettings.h" line="446"/>
+        <location filename="../build/ui_plannerSettings.h" line="459"/>
+        <location filename="../build/ui_plannerSettings.h" line="461"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="115"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="121"/>
+        <location filename="../build/ui_plannerSettings.h" line="425"/>
         <source>75% to 50% avg. depth</source>
         <translation>75% do 50% śr. głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="132"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="138"/>
+        <location filename="../build/ui_plannerSettings.h" line="427"/>
         <source>50% avg. depth to 6m</source>
         <translation>50% śr. głębokości do 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="149"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="155"/>
+        <location filename="../build/ui_plannerSettings.h" line="429"/>
         <source>6m to surface</source>
         <translation>6m do powierzchni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="499"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="370"/>
+        <location filename="../build/ui_plannerSettings.h" line="453"/>
+        <source>min</source>
+        <translation>min</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="396"/>
+        <location filename="../build/ui_plannerSettings.h" line="443"/>
+        <source>Recreational mode</source>
+        <translation>Tryb rekreacyjny</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="433"/>
+        <location filename="../build/ui_plannerSettings.h" line="452"/>
+        <source>Min. switch duration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="456"/>
+        <location filename="../build/ui_plannerSettings.h" line="444"/>
+        <source>Safety stop</source>
+        <translation>Przystanek bezpieczeństwa</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="492"/>
+        <source>Conservatism level</source>
+        <translation>Poziom konserwatyzmu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="605"/>
+        <location filename="../build/ui_plannerSettings.h" line="464"/>
+        <source>Notes</source>
+        <translation>Opis</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/plannerSettings.ui" line="626"/>
+        <location filename="../build/ui_plannerSettings.h" line="466"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
         <translation>Pokazuj runtime, czyli całkowity czas dla przystanku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="515"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="639"/>
+        <location filename="../build/ui_plannerSettings.h" line="470"/>
         <source>In dive plan, show duration (relative time) of stops</source>
         <translation>Pokazuj czas trwania (względny czas) przystanku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/plannerSettings.ui" line="528"/>
+        <location filename="../qt-ui/plannerSettings.ui" line="649"/>
+        <location filename="../build/ui_plannerSettings.h" line="474"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
         <translation>Pokazuj lub ukrywaj listę przejść </translation>
     </message>