Pull latest translations

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2017-02-16 23:06:43 -0800
committer: Dirk Hohndel <dirk@hohndel.org> 2017-02-16 23:06:43 -0800
commit: c5b9cfcaf655bd5af3bf57277b3591505d84e1cb (patch)
tree: 8c56827f29399704a8caebf8a609a1d708ede420 /translations
parent: 93763f31648f4d728620a401882de858e054d485 (diff)
download: subsurface-c5b9cfcaf655bd5af3bf57277b3591505d84e1cb.tar.gz
10 files changed, 2265 insertions, 2159 deletions
diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts
index c2908f079..5fe33fcc6 100644
--- a/translations/subsurface_cs.ts
+++ b/translations/subsurface_cs.ts
@@ -11,13 +11,13 @@
         <location filename="../mobile-widgets/qml/About.qml" line="36"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
-        <translation>Přenosná verze programu zdarma pro záznam potápění Subsurface.
+        <translation>Mobilní verze svobodného potápěčského deníku Subsurface.
 </translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>View your dive logs while on the go.</source>
-        <translation type="unfinished"/>
+        <translation>Prohlžejte své záznamy ponorů na cestách.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="48"/>
@@ -25,7 +25,10 @@
 
 © Subsurface developer team
 2011-2017</source>
-        <translation type="unfinished"/>
+        <translation>Verze: %1
+
+© vývojový tým Subsurface
+2011-2017</translation>
     </message>
 </context>
 <context>
@@ -69,7 +72,7 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Local Bluetooth device details</source>
-        <translation>Podrobnosti místního zařízení Bluetooth</translation>
+        <translation>Podrobnosti lokálního zařízení Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/>
@@ -86,7 +89,7 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <source>Bluetooth powered on</source>
-        <translation type="unfinished"/>
+        <translation>Bluetooth zapnuto</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
@@ -108,17 +111,17 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
         <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
+        <translation>Nelze inicializovat Winsock verze 2.2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
-        <translation type="unfinished"/>
+        <translation>Zapínání lokálního Bluetooth zařízení...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="137"/>
         <source>Trying to turn off the local Bluetooth device...</source>
-        <translation type="unfinished"/>
+        <translation>Vypínání lokálního Bluetooth zařízení...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
@@ -139,7 +142,7 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
         <source>The local Bluetooth device was %1.</source>
         <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
+        <translation>Lokální Bluetooth zařízení bylo %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
@@ -156,21 +159,21 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
         <source>UNPAIRED</source>
-        <translation type="unfinished"/>
+        <translation>NESPÁROVÁNO</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="229"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="344"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="357"/>
         <source>PAIRED</source>
-        <translation type="unfinished"/>
+        <translation>SPÁROVÁNO</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="358"/>
         <source>AUTHORIZED_PAIRED</source>
-        <translation type="unfinished"/>
+        <translation>SPÁROVÁNO_S_AUTORIZACÍ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/>
@@ -180,18 +183,18 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/>
         <source>The device %1 can be used for connection. You can press the Save button.</source>
-        <translation type="unfinished"/>
+        <translation>Zařízení %1 může být použito pro připojení. Můžete stisknout tlačítko Uložit.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="262"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/>
         <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
-        <translation type="unfinished"/>
+        <translation>Zařízení %1 musí být pro použití spárováno. Použijte prosím kontextové menu pro možnosti párování.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="286"/>
         <source>The local device was changed.</source>
-        <translation>Místní zařízení bylo změněno.</translation>
+        <translation>Lokální zařízení bylo změněno.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="306"/>
@@ -201,7 +204,7 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
-        <translation>Odstranit párování</translation>
+        <translation>Odebrat spárování</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
@@ -226,22 +229,22 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
         <source>Device %1 was paired and is authorized.</source>
-        <translation>Zařízení %1 bylo spárováno a je schváleno.</translation>
+        <translation>Zařízení %1 bylo spárováno a je autorizováno.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
-        <translation type="unfinished"/>
+        <translation>Zařízení %1 nyní může být použito pro připojení. Můžete stisknout tlačítko Uložit.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/>
         <source>Local device error: %1.</source>
-        <translation>Chyba místního zařízení: %1</translation>
+        <translation>Chyba lokálního zařízení: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/>
         <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
-        <translation type="unfinished"/>
+        <translation>Chyba párování. Pokud vzdálené zařízení vyžaduje PIN, zkuste prosím zařízení spárovat ve vašem operačním systému.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="393"/>
@@ -251,12 +254,12 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="402"/>
         <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
-        <translation type="unfinished"/>
+        <translation>Bluetooth adaptér je odpojen, před vyhledáváním jej zapojte.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="405"/>
         <source>Writing to or reading from the device resulted in an error.</source>
-        <translation type="unfinished"/>
+        <translation>Zapisování do nebo čtení ze zařízení skončilo chybou.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/>
@@ -266,7 +269,7 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/>
         <source>Device discovery error: %1.</source>
-        <translation>Chyba při zjišťování zařízení: %1.</translation>
+        <translation>Chyba při vyhledávání zařízení: %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/>
@@ -276,12 +279,12 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="451"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
-        <translation type="unfinished"/>
+        <translation>Nelze přistupovat k lokálnímu Bluetooth adaptéru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="501"/>
         <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
-        <translation type="unfinished"/>
+        <translation>Vyhledávací agent zařízení nebyl vytvořen, protože adresa %1 neodpovídá žádné fyzické adrese Bluetooth adaptéru.</translation>
     </message>
 </context>
 <context>
@@ -294,7 +297,7 @@
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/>
         <source>Searches for buddies and divemasters</source>
-        <translation>Hledání společníků při potápění a učitelů potápění (vedoucích skupiny)</translation>
+        <translation>Hledání buddy a divemasterů</translation>
     </message>
 </context>
 <context>
@@ -302,7 +305,7 @@
     <message>
         <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
-        <translation>Žádný společník při potápění</translation>
+        <translation>Žádný buddy</translation>
     </message>
 </context>
 <context>
@@ -310,7 +313,7 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Přístupové údaje ke cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
@@ -325,7 +328,7 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
-        <translation>Ukázat heslo</translation>
+        <translation>Zobrazit heslo</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
@@ -338,7 +341,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Dive #</source>
-        <translation>Číslo potápění</translation>
+        <translation>Ponor číslo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
@@ -373,7 +376,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Cyl. size</source>
-        <translation>Velikost láhve</translation>
+        <translation>Velikost lahve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
@@ -398,12 +401,12 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
@@ -418,7 +421,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Tags</source>
-        <translation>Značky</translation>
+        <translation>Tagy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
@@ -478,7 +481,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/>
         <source>Sample stopdepth</source>
-        <translation>Hloubka zastavení vzorku</translation>
+        <translation>Hloubka zastávky vzorku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/>
@@ -503,7 +506,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/>
         <source>Sample setpoint</source>
-        <translation>Bod nastavení vzorku</translation>
+        <translation>Setpoint vzorku</translation>
     </message>
 </context>
 <context>
@@ -511,17 +514,17 @@
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="220"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
-        <translation>Nepodařilo se uložit soubor se zálohou %1. Zpráva o chybě: %2</translation>
+        <translation>Nepodařilo se uložit záložní soubor %1. Chybová hláška: %2</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="236"/>
         <source>Could not open backup file: %1</source>
-        <translation>Nepodařilo se otevřít soubor se zálohou: %1</translation>
+        <translation>Nepodařilo se otevřít záložní soubor: %1</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="584"/>
         <source>Dive computer details read successfully</source>
-        <translation>Podrobnosti o potápěcím počítači úspěšně přečteny</translation>
+        <translation>Podrobnosti o potápěčském počítači úspěšně načteny</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="593"/>
@@ -531,22 +534,22 @@
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="602"/>
         <source>Device firmware successfully updated</source>
-        <translation>Firmware počítače úspěšně aktualizován</translation>
+        <translation>Firmware zařízení úspěšně aktualizován</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="611"/>
         <source>Device settings successfully reset</source>
-        <translation>Základní nastavení počítače úspěšně obnoveno</translation>
+        <translation>Základní nastavení zařízení úspěšně obnoveno</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="627"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation>Potíže při inicializaci libdivecomputer</translation>
+        <translation>Nelze inicializovat libdivecomputer</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
-        <translation>Nepodařilo se zřídit spojení s potápěcím počítačem.</translation>
+        <translation>Nelze zřídit spojení s potápěčským počítačem.</translation>
     </message>
 </context>
 <context>
@@ -554,7 +557,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
         <source>Configure dive computer</source>
-        <translation>Nastavení potápěcího počítače</translation>
+        <translation>Konfigurovat potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
@@ -579,12 +582,12 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <source>Retrieve available details</source>
-        <translation>Nahrát dostupné podrobnosti</translation>
+        <translation>Získat dostupné podrobnosti</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
         <source>Read settings from backup file or from device before writing to the device</source>
-        <translation type="unfinished"/>
+        <translation>Před zápisem do zařízení načíst nastavení ze záložního souboru nebo zařízení</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
@@ -594,7 +597,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
         <source>Read settings from backup file or from device before writing to a backup file</source>
-        <translation type="unfinished"/>
+        <translation>Před zápisem do záložního souboru načíst nastavení ze záložního souboru nebo zařízení</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
@@ -614,7 +617,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
         <source>Save libdivecomputer logfile</source>
-        <translation>Uložit soubor se záznamem libdivecomputer</translation>
+        <translation>Uložit soubor s logem libdivecomputer</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
@@ -686,22 +689,22 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
         <source>English</source>
-        <translation>Anglický</translation>
+        <translation>Anglicky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="294"/>
         <source>German</source>
-        <translation>Německý</translation>
+        <translation>Německy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="299"/>
         <source>French</source>
-        <translation>Francouzský</translation>
+        <translation>Francouzsky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="304"/>
         <source>Italian</source>
-        <translation>Italský</translation>
+        <translation>Italsky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
@@ -751,7 +754,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
         <source>Date format</source>
-        <translation>Formát data</translation>
+        <translation>Formát datumu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
@@ -767,12 +770,12 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
         <source>Salinity (0-5%)</source>
-        <translation>Obsah soli (0-5 %)</translation>
+        <translation>Salinita (0-5 %)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
         <source>Reset device to default settings</source>
-        <translation>Nastavit zařízení znovu na výchozí nastavení</translation>
+        <translation>Obnovit výchozí nastavení zařízení</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
@@ -899,7 +902,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
         <source>Sync dive computer time with PC</source>
-        <translation>Seřízení času potápěcího počítače s PC</translation>
+        <translation>Synchronizovat čas potápěčského počítače s PC</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
@@ -910,7 +913,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
         <source>Show safety stop</source>
-        <translation>Ukázat bezpečnostní zastávku</translation>
+        <translation>Zobrazit bezpečnostní zastávku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
@@ -940,7 +943,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
         <source>Reset Depth</source>
-        <translation>Nastavit hloubku znovu na výchozí</translation>
+        <translation>Obnovit výchozí hloubku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
@@ -968,13 +971,13 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
         <source>Always show ppO2</source>
-        <translation>Vždy ukázat ppO2</translation>
+        <translation>Vždy zobrazit pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2254"/>
         <source>Alt GF can be selected underwater</source>
-        <translation>Alt GF lze vybrat pod vodou</translation>
+        <translation>Alternativní GF lze zvolit pod vodou</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
@@ -1003,7 +1006,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
         <source>Desaturation</source>
-        <translation>Odsycení</translation>
+        <translation>Vysycení</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
@@ -1037,7 +1040,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
         <source>Last deco</source>
-        <translation>Poslední zastavení</translation>
+        <translation>Poslední dekomprese</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
@@ -1060,7 +1063,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
         <source>Flip screen</source>
-        <translation>Obrátit obrazovku</translation>
+        <translation>Otočit obrazovku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1059"/>
@@ -1070,30 +1073,30 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
         <source>MOD warning</source>
-        <translation type="unfinished"/>
+        <translation>Varování MOD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
         <source>Graphical speed indicator</source>
-        <translation>Názorný ukazatel rychlosti</translation>
+        <translation>Grafický ukazatel rychlosti</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
         <source>Dynamic ascent rate</source>
-        <translation type="unfinished"/>
+        <translation>Dynamická výstupová rychlost</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
         <source>Bottom gas consumption</source>
-        <translation>Spodní spotřeba plynu</translation>
+        <translation>Spotřeba plynu na dně</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1094"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2559"/>
         <source>Deco gas consumption</source>
-        <translation type="unfinished"/>
+        <translation>Spotřeba plynu při dekompresi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
@@ -1117,7 +1120,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2567"/>
         <source>Gas settings</source>
-        <translation>Nastavení směsi</translation>
+        <translation>Nastavení plynu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
@@ -1151,37 +1154,37 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2775"/>
         <source>Change depth</source>
-        <translation>Hloubka změny</translation>
+        <translation>Změnit hloubku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1255"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2630"/>
         <source>Gas 1</source>
-        <translation>Směs 1</translation>
+        <translation>Plyn 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1260"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2635"/>
         <source>Gas 2</source>
-        <translation>Směs 2</translation>
+        <translation>Plyn 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1265"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2640"/>
         <source>Gas 3</source>
-        <translation>Směs 3</translation>
+        <translation>Plyn 3</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1270"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2645"/>
         <source>Gas 4</source>
-        <translation>Směs 4</translation>
+        <translation>Plyn 4</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1275"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2650"/>
         <source>Gas 5</source>
-        <translation>Směs 5</translation>
+        <translation>Plyn 5</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1340"/>
@@ -1217,7 +1220,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
         <source>Setpoint</source>
-        <translation>Nastavovací hodnota</translation>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1250,12 +1253,12 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
         <source>O₂ in calibration gas</source>
-        <translation>O₂ v kalibrační směsi</translation>
+        <translation>O₂ v kalibračním plynu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
         <source>Fixed setpoint</source>
-        <translation>Stálá nastavovací hodnota</translation>
+        <translation>Fixní setpoint</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/>
@@ -1265,7 +1268,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1480"/>
         <source>Setpoint fallback</source>
-        <translation>Záložní nastavovací hodnota</translation>
+        <translation>Záložní hodnota setpointu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1503"/>
@@ -1306,7 +1309,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1636"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2013"/>
         <source>Number of dives</source>
-        <translation>Počet potápění</translation>
+        <translation>Počet ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/>
@@ -1334,7 +1337,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
         <source>Sample rate</source>
-        <translation>Míra vzorku</translation>
+        <translation>Vzorkovací rychlost</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1774"/>
@@ -1354,7 +1357,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
         <source>Total dive time</source>
-        <translation>Celkový čas potápění</translation>
+        <translation>Celkový čas ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1380,7 +1383,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/>
         <source>Imperial</source>
-        <translation>Anglický</translation>
+        <translation>Imperiální</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1863"/>
@@ -1425,7 +1428,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
         <source>Salinity</source>
-        <translation>Obsah soli</translation>
+        <translation>Salinita</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
@@ -1460,13 +1463,13 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1127"/>
         <source>Backup dive computer settings</source>
-        <translation>Nastavení záložního potápěcího počítače</translation>
+        <translation>Nastavení záložního potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1149"/>
         <source>Backup files (*.xml)</source>
-        <translation>Soubory se zálohou (*.xml)</translation>
+        <translation>Záložní soubory (*.xml)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
@@ -1477,13 +1480,13 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1133"/>
         <source>An error occurred while saving the backup file.
 %1</source>
-        <translation>Chyba při ukládání souboru se zálohou.
+        <translation>Chyba při ukládání záložního souboru.
 %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1136"/>
         <source>Backup succeeded</source>
-        <translation>Vytvoření zálohy úspěšné</translation>
+        <translation>Záloha úspěšně vytvořena</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
@@ -1493,7 +1496,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1148"/>
         <source>Restore dive computer settings</source>
-        <translation>Obnova nastavení potápěcího počítače</translation>
+        <translation>Obnovit nastavení potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
@@ -1504,18 +1507,18 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1155"/>
         <source>An error occurred while restoring the backup file.
 %1</source>
-        <translation>Při obnově zálohy nastala chyba.
+        <translation>Chyba při obnově záložního souboru.
 %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1159"/>
         <source>Restore succeeded</source>
-        <translation>Úspěšná obnova</translation>
+        <translation>Obnova úspěšně proběhla</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1160"/>
         <source>Your settings have been restored successfully.</source>
-        <translation>Nastavení byla obnovena úspěšně.</translation>
+        <translation>Vaše nastavení bylo úspěšně obnoveno.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1170"/>
@@ -1530,12 +1533,12 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/>
         <source>Choose file for divecomputer download logfile</source>
-        <translation>Vyberte soubor ke stažení souboru se záznamem potápecího počítače</translation>
+        <translation>Vyberte log soubor pro stahování z potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1228"/>
         <source>Log files (*.log)</source>
-        <translation>Soubory se záznamy (*.log)</translation>
+        <translation>Log soubory (*.log)</translation>
     </message>
 </context>
 <context>
@@ -1561,7 +1564,7 @@
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>Work press.</source>
-        <translation>Provozní tlak</translation>
+        <translation>Pracovní tlak</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1576,22 +1579,22 @@
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>O₂%</source>
-        <translation>O₂%</translation>
+        <translation>O₂ %</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="16"/>
         <source>He%</source>
-        <translation>He%</translation>
+        <translation>He %</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Deco switch at</source>
-        <translation type="unfinished"/>
+        <translation>Dekompresní změna v</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Bot. MOD</source>
-        <translation type="unfinished"/>
+        <translation>MOD na dně</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1606,7 +1609,7 @@
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="43"/>
         <source>cuft</source>
-        <translation>cu stopa</translation>
+        <translation>kubická stopa (cuft)</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="47"/>
@@ -1616,32 +1619,32 @@
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="235"/>
         <source>Clicking here will remove this cylinder.</source>
-        <translation>Klepnutí zde odstraní tuto láhev.</translation>
+        <translation>Kilknutím sem odeberete tuto lahev.</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="247"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
-        <translation type="unfinished"/>
+        <translation>Změnit hloubku pro dekompresní plyn. Vypočteno s použitím pO₂ pro dekompresi, pokud nebylo nastaveno ručně.</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="250"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
-        <translation type="unfinished"/>
+        <translation>Vypočteno s použitím nastavení pO₂ na dně. Nastavení MOD upravuje O₂ %, nastavení na &apos;*&apos; pro nejlepší O₂ % pro maximální hloubku.</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
-        <translation type="unfinished"/>
+        <translation>Vypočteno s použitím nastavení nejlepší směsi END. Nastavení MND upravuje He %, nastavení na &apos;*&apos; pro nejlepší He % pro maximální hloubku.</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="522"/>
         <source>Cylinder cannot be removed</source>
-        <translation>Láhev nelze odstranit</translation>
+        <translation>Lahev nelze odebrat</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="523"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
-        <translation>Tento plyn se používá. Lze odstranit jen ty láhve, jež nejsou při potápění používány.</translation>
+        <translation>Tento plyn je používán. Lze odstranit jen ty lahve, jež nejsou použity při ponoru.</translation>
     </message>
 </context>
 <context>
@@ -1659,7 +1662,7 @@
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
         <source>Dive site</source>
-        <translation>Stránka potápění</translation>
+        <translation>Potápěčská lokalita</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
@@ -1679,27 +1682,27 @@
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="101"/>
         <source>Tags</source>
-        <translation>Značky</translation>
+        <translation>Tagy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="108"/>
         <source>Weights</source>
-        <translation>Olovo</translation>
+        <translation>Zátěž</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="115"/>
         <source>Cylinders</source>
-        <translation>Láhve</translation>
+        <translation>Lahve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
         <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
         <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
@@ -1712,18 +1715,18 @@
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
         <source>Edit dive computer nicknames</source>
-        <translation>Upravit označení potápěcího počítače</translation>
+        <translation>Upravit názvy potápěčských počítačů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
         <source>Remove the selected dive computer?</source>
-        <translation>Odstranit vybraný potápecí počítač?</translation>
+        <translation>Odstranit vybraný potápěčský počítač?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="50"/>
         <source>Are you sure that you want to 
  remove the selected dive computer?</source>
-        <translation>Jste si jistý, že chcete odstranit vybraný potápecí počítač?</translation>
+        <translation>Opravdu chcete odstranit vybraný potápěčský počítač?</translation>
     </message>
 </context>
 <context>
@@ -1736,17 +1739,17 @@
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Device ID</source>
-        <translation>Označení zařízení</translation>
+        <translation>ID zařízení</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="7"/>
         <source>Nickname</source>
-        <translation>Název zařízení</translation>
+        <translation>Název</translation>
     </message>
     <message>
         <location filename="../qt-models/divecomputermodel.cpp" line="41"/>
         <source>Clicking here will remove this dive computer.</source>
-        <translation>Klepnutí zde odstraní tento potápecí počítač.</translation>
+        <translation>Kliknutím sem odstraníte tento potápěčský počítač.</translation>
     </message>
 </context>
 <context>
@@ -1754,22 +1757,22 @@
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
-        <translation>Podrobnosti potápění</translation>
+        <translation>Podrobnosti ponoru</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
-        <translation>Smazat potápění</translation>
+        <translation>Smazat ponor</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
-        <translation>Ukázat na mapě</translation>
+        <translation>Zobrazit na mapě</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
         <source>Multiple Buddies</source>
-        <translation type="unfinished"/>
+        <translation>Více buddy</translation>
     </message>
 </context>
 <context>
@@ -1777,7 +1780,7 @@
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
-        <translation type="unfinished"/>
+        <translation>Ponor %1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
@@ -1799,7 +1802,7 @@
         <source>Use current
 GPS location:</source>
         <translation>Použít nynější
-polohu GPS:</translation>
+GPS polohu:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
@@ -1809,7 +1812,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
         <source>Duration:</source>
-        <translation>Délka:</translation>
+        <translation>Trvání:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
@@ -1829,22 +1832,22 @@ polohu GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
         <source>Buddy:</source>
-        <translation>Společník při potápění:</translation>
+        <translation>Buddy:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
-        <translation>Průvodce potápěním:</translation>
+        <translation>Divemaster:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
-        <translation>Váha:</translation>
+        <translation>Zátěž:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
         <source>Cylinder:</source>
-        <translation>Láhev:</translation>
+        <translation>Lahev:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
@@ -1887,12 +1890,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
         <source>No profile to show</source>
-        <translation>Žádný profil k ukázání</translation>
+        <translation>Žádný profil k zobrazení</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
         <source>Dive Details</source>
-        <translation>Podrobnosti potápění</translation>
+        <translation>Podrobnosti ponoru</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
@@ -1907,7 +1910,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation>Láhev:</translation>
+        <translation>Lahev:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
@@ -1917,17 +1920,17 @@ polohu GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
-        <translation>Průvodce potápěním:</translation>
+        <translation>Divemaster:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
-        <translation>Váha:</translation>
+        <translation>Zátěž:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
         <source>Buddy:</source>
-        <translation>Společník při potápění:</translation>
+        <translation>Buddy:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
@@ -1945,7 +1948,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
         <source>Manual switch to OC</source>
-        <translation type="unfinished"/>
+        <translation>Ruční přepnutí na OC</translation>
     </message>
     <message>
         <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
@@ -2010,17 +2013,17 @@ polohu GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Přístupové údaje ke cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
-        <translation>Ťukněte, prosím, na tlaítko + pro přidání potápění</translation>
+        <translation>Pro přidání ponoru klikněte na tlačítko &apos;+&apos;</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/>
         <source>No dives in dive list</source>
-        <translation>Žádná potápění v seznamu potápění</translation>
+        <translation>Žádné ponory v seznamu</translation>
     </message>
 </context>
 <context>
@@ -2043,62 +2046,62 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
         <source>Remove dive(s) from trip</source>
-        <translation>Odstranit potápení z cesty</translation>
+        <translation>Odstranit ponor(y) z výletu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
         <source>Create new trip above</source>
-        <translation>Vytvořit novou cestu výše</translation>
+        <translation>Vytvořit nový výlet výše</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
         <source>Add dive(s) to trip immediately above</source>
-        <translation>Přidat potápění k cestě bezprostředně výše</translation>
+        <translation>Přidat ponor(y) k výletu výše</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
         <source>Add dive(s) to trip immediately below</source>
-        <translation>Přidat potápění k cestě bezprostředně níže</translation>
+        <translation>Přidat ponor(y) k výletu níže</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
         <source>Merge trip with trip above</source>
-        <translation>Spojit cestu s cestou výše</translation>
+        <translation>Sloučit výlet s výletem výše</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
         <source>Merge trip with trip below</source>
-        <translation>Spojit cestu s cestou níže</translation>
+        <translation>Sloučit výlet s výletem níže</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
         <source>Delete dive(s)</source>
-        <translation>Smazat potápění</translation>
+        <translation>Smazat ponor(y)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
         <source>Mark dive(s) invalid</source>
-        <translation>Označit potápění jako neplatné</translation>
+        <translation>Označit ponor(y) jako neplatné</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
         <source>Merge selected dives</source>
-        <translation>Sloučit vybraná potápění</translation>
+        <translation>Sloučit vybrané ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
         <source>Renumber dive(s)</source>
-        <translation>Přečíslovat potápění</translation>
+        <translation>Přečíslovat ponor(y)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
         <source>Shift dive times</source>
-        <translation>Posunout časy potápění</translation>
+        <translation>Posunout časy ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
         <source>Split selected dives</source>
-        <translation>Rozdělit vybraná potápění</translation>
+        <translation>Rozdělit vybrané ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
@@ -2108,12 +2111,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image from web</source>
-        <translation type="unfinished"/>
+        <translation>Nahrání obrázek z webu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="974"/>
         <source>%1 does not appear to be an image</source>
-        <translation type="unfinished"/>
+        <translation>%1 se nezdá být obrázkem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
@@ -2131,12 +2134,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="330"/>
         <source>Create a new dive site, copying relevant information from the current dive.</source>
-        <translation type="unfinished"/>
+        <translation>Vytvořit novou potápěčskou lokalitu, zkopírovat relevantní informace ze současné lokality.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="331"/>
         <source>Create a new dive site with this name</source>
-        <translation type="unfinished"/>
+        <translation>Vytvořit novou potápěčskou lokalitu s tímto názvem</translation>
     </message>
 </context>
 <context>
@@ -2144,17 +2147,17 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
         <source>Export dive log files</source>
-        <translation>Vyvést soubory se záznamy o potápění</translation>
+        <translation>Exportovat soubory potápěčského deníku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="44"/>
         <source>General export</source>
-        <translation>Obecné vyvedení</translation>
+        <translation>Obecný export</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
         <source>Export format</source>
-        <translation>Ukládací formát</translation>
+        <translation>Formát exportu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
@@ -2179,12 +2182,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="167"/>
         <source>CSV dive profile</source>
-        <translation>Profil potápění CSV</translation>
+        <translation>CSV porofil ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="177"/>
         <source>CSV dive details</source>
-        <translation>Podrobnosti potápění CSV</translation>
+        <translation>CSV podrobnosti ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
@@ -2199,7 +2202,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
         <source>I&amp;mage depths</source>
-        <translation>Hloubka, v níž byl &amp;obrázek pořízen</translation>
+        <translation>Hloubky pořízení &amp;obrázků</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
@@ -2210,12 +2213,12 @@ polohu GPS:</translation>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
         <source>Selected dives</source>
-        <translation>Vybraná potápění</translation>
+        <translation>Vybrané ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
         <source>All dives</source>
-        <translation>Všechna potápění</translation>
+        <translation>Všechny ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
@@ -2230,7 +2233,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
         <source>Imperial</source>
-        <translation>Anglický palcový</translation>
+        <translation>Imperiální</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
@@ -2250,27 +2253,27 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
         <source>Export yearly statistics</source>
-        <translation>Vyvést roční statistiky</translation>
+        <translation>Exportovat roční statistiky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
         <source>All di&amp;ves</source>
-        <translation>Všechna &amp;potápění</translation>
+        <translation>Všechny &amp;ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
         <source>Export list only</source>
-        <translation>Vyvést pouze seznamy</translation>
+        <translation>Exportovat pouze seznam</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
         <source>Export photos</source>
-        <translation>Vyvést fotografie</translation>
+        <translation>Exportovat fotografie</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
         <source>Style options</source>
-        <translation>Volby pro styl</translation>
+        <translation>Nastavení stylu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
@@ -2336,115 +2339,115 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
         <source>Generic format that is used for data exchange between a variety of diving related programs.</source>
-        <translation>Všeobecný formát používaný pro výměnu dat mezi různými potápěčskými programy.</translation>
+        <translation>Obecný formát používaný pro výměnu dat mezi různými potápěčskými programy.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
         <source>Comma separated values describing the dive profile.</source>
-        <translation type="unfinished"/>
+        <translation>Čárkou oddělené hodnoty popisující profil ponoru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
         <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source>
-        <translation type="unfinished"/>
+        <translation>Čárkou oddělené hodnoty informací o ponoru. Zahrnuje většinu detailů ponoru, ale ne informaci o profilu.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
         <source>Send the dive data to divelogs.de website.</source>
-        <translation>Odeslat data o potápění na stránku divelogs.de.</translation>
+        <translation>Odeslat data ponoru na web divelogs.de.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
         <source>Send the dive data to dive-share.appspot.com website</source>
-        <translation>Odeslat data o potápění na stránku dive-share.appspot.com</translation>
+        <translation>Odeslat data ponoru na web dive-share.appspot.com</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
         <source>HTML export of the dive locations, visualized on a world map.</source>
-        <translation>Vyvedení potápěčského místa do HTML zobrazené na mapě světa.</translation>
+        <translation>HTML export potápěčských lokalit, zobrazených na mapě světa.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
         <source>Subsurface native XML format.</source>
-        <translation>Původní formát XML programu Subsurface.</translation>
+        <translation>Vlastní XML formát programu Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
         <source>Write depths of images to file.</source>
-        <translation>Zapsat hloubku, v níž byl obrázek pořízen, do souboru.</translation>
+        <translation>Zapsat hloubky pořízení obrázků do souboru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Write dive as TeX macros to file.</source>
-        <translation type="unfinished"/>
+        <translation>Zapsat ponor jako TeX makra do souboru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
         <source>Export UDDF file as</source>
-        <translation>Vyvést soubor UDDF jako</translation>
+        <translation>Exportovat UDDF soubor jako</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
-        <translation>Soubory UDDF (*.uddf *.UDDF)</translation>
+        <translation>UDDF soubory (*.uddf *.UDDF)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
         <source>Export CSV file as</source>
-        <translation>Vyvést soubor CSV jako</translation>
+        <translation>Exportovat CSV soubor jako</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
         <source>CSV files (*.csv *.CSV)</source>
-        <translation>Soubory CSV (*.csv *.CSV)</translation>
+        <translation>CSV soubory (*.csv *.CSV)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
         <source>Export world map</source>
-        <translation>Vyvést mapu světa</translation>
+        <translation>Exportovat mapu světa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
         <source>HTML files (*.html)</source>
-        <translation>Soubory HTML (*.html)</translation>
+        <translation>HTML soubory (*.html)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
         <source>Export Subsurface XML</source>
-        <translation>Vyvést Subsurface XML</translation>
+        <translation>Exportovat Subsurface XML</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
         <source>XML files (*.xml *.ssrf)</source>
-        <translation>Soubory XML (*.xml *.ssrf)</translation>
+        <translation>XML soubory (*.xml *.ssrf)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
         <source>Save image depths</source>
-        <translation>Uložit hloubku, v níž byl obrázek pořízen</translation>
+        <translation>Uložit hloubky pořízení obrázku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
         <source>Export to TeX file</source>
-        <translation type="unfinished"/>
+        <translation>Exportovat do TeX souboru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
         <source>TeX files (*.tex)</source>
-        <translation type="unfinished"/>
+        <translation>TeX soubory (*.tex)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
         <source>Export HTML files as</source>
-        <translation>Vyvést soubor HTML jako</translation>
+        <translation>Exportovat HTML soubory jako</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
         <source>Please wait, exporting...</source>
-        <translation type="unfinished"/>
+        <translation>Prosím čekejte, exportuje se...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
@@ -2458,7 +2461,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="14"/>
         <source>Import dive log file</source>
-        <translation>Zavést soubory se záznamy o potápění</translation>
+        <translation>Importovat soubor potápěčského deníku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
@@ -2498,12 +2501,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
         <source>Imperial</source>
-        <translation>Anglické</translation>
+        <translation>Imperiální</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
         <source>Drag the tags above to each corresponding column below</source>
-        <translation>Značky nahoře přetáhněte na odpovídající sloupce dole</translation>
+        <translation>Tagy nahoře přetáhněte k odpovídajícím sloupcům dole</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="358"/>
@@ -2514,7 +2517,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="601"/>
         <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source>
-        <translation type="unfinished"/>
+        <translation>Některé hlavičky sloupců byly předvyplněny, prosím přetáhněte hlavičky, aby odpovídaly správným sloupcům.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="639"/>
@@ -2592,7 +2595,7 @@ polohu GPS:</translation>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/>
         <source>Sample stopdepth</source>
-        <translation>Hloubka zastavení vzorku</translation>
+        <translation>Hloubka zastávky vzorku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
@@ -2605,14 +2608,14 @@ polohu GPS:</translation>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
         <source>Sample setpoint</source>
-        <translation>Bod nastavení vzorku</translation>
+        <translation>Setpoint vzorku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="762"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="932"/>
         <source>Dive #</source>
-        <translation>Číslo potápění</translation>
+        <translation>Číslo ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
@@ -2662,7 +2665,7 @@ polohu GPS:</translation>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="968"/>
         <source>Cyl. size</source>
-        <translation>Velikost láhve</translation>
+        <translation>Velikost lahve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
@@ -2704,13 +2707,13 @@ polohu GPS:</translation>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="948"/>
         <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="950"/>
         <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
@@ -2752,12 +2755,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
-        <translation type="unfinished"/>
+        <translation>%1 ponor(y)</translation>
     </message>
     <message>
         <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
         <source>Multiple Buddies</source>
-        <translation type="unfinished"/>
+        <translation>Více buddies</translation>
     </message>
 </context>
 <context>
@@ -2765,7 +2768,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="109"/>
         <source>Planned dive time</source>
-        <translation>Plánovaná doba trvání</translation>
+        <translation>Plánovaná doba ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
@@ -2780,7 +2783,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="166"/>
         <source>Salinity</source>
-        <translation>Obsah soli</translation>
+        <translation>Salinita</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.ui" line="179"/>
@@ -2803,17 +2806,17 @@ polohu GPS:</translation>
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="142"/>
         <source>unknown</source>
-        <translation>Neznámý</translation>
+        <translation>neznámý</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Final depth</source>
-        <translation>Konečná hloubka</translation>
+        <translation>Koncová hloubka</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>Run time</source>
-        <translation>Doba potápění</translation>
+        <translation>Čas konce</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="336"/>
@@ -2823,12 +2826,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="338"/>
         <source>Used gas</source>
-        <translation>Spotřeba plynu</translation>
+        <translation>Použitý plyn</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplannermodel.cpp" line="340"/>
         <source>CC setpoint</source>
-        <translation type="unfinished"/>
+        <translation>CC setpoint</translation>
     </message>
 </context>
 <context>
@@ -2836,7 +2839,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
         <source>Dive planner points</source>
-        <translation>Body plánovače potápění</translation>
+        <translation>Body plánovače ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
@@ -2846,7 +2849,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
         <source>Add dive data point</source>
-        <translation>Přidat bod potápěcích dat</translation>
+        <translation>Přidat bod do dat ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
@@ -2884,12 +2887,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
         <source>User entered</source>
-        <translation>Zadání uživatele</translation>
+        <translation>Uživatel zadal</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
         <source>Cylinder index</source>
-        <translation>Lahvový index</translation>
+        <translation>Index lahve</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
@@ -2909,7 +2912,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
         <source>SAC</source>
-        <translation>Spotřeba plynu</translation>
+        <translation>Spotřeba plynu (SAC)</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
@@ -2929,7 +2932,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/>
         <source>Setpoint</source>
-        <translation>Nastavovací hodnota</translation>
+        <translation>Setpoint</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/>
@@ -2954,12 +2957,12 @@ polohu GPS:</translation>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
         <source>Heart rate</source>
-        <translation>Srdeční rytmus</translation>
+        <translation>Tepová frekvence</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
         <source>Gradient factor</source>
-        <translation type="unfinished"/>
+        <translation>Gradientní faktor</translation>
     </message>
     <message>
         <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
@@ -2977,7 +2980,7 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="61"/>
         <source>User ID</source>
-        <translation>Označení uživatele</translation>
+        <translation>ID uživatele</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="75"/>
@@ -2987,27 +2990,27 @@ polohu GPS:</translation>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="82"/>
         <source>Get user ID</source>
-        <translation>Získat označení uživatele</translation>
+        <translation>Získat ID uživatele</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="91"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:20pt; font-weight:600; color:#ff8000;&quot;&gt;⚠&lt;/span&gt; Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <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; Nepoužívání uživatelského ID má za následek, že budete muset ručně udržovat záložky, abyste znovu nalezli své ponory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="104"/>
         <source>Private dives will not appear in &quot;related dives&quot; lists, and will only be accessible if their URL is known.</source>
-        <translation type="unfinished"/>
+        <translation>Soukromé ponory nebudou v seznamu „souvisejících ponorů“, budou dostupné pouze, pokud je známa jejich URL.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="107"/>
         <source>Keep dives private</source>
-        <translation>Držet potápění soukromé</translation>
+        <translation>Zachovat ponory soukromé</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="129"/>
         <source>Upload dive data</source>
-        <translation>Nahrát potápěcí data</translation>
+        <translation>Nahrát data ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveshareexportdialog.ui" line="174"/>
@@ -3016,7 +3019,11 @@ polohu GPS:</translation>
 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"/>
+        <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;Oxygen-Sans&apos;; 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;</translation>
     </message>
 </context>
 <context>
@@ -3058,7 +3065,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="451"/>
         <source>Weight</source>
-        <translation>Váha</translation>
+        <translation>Zátěž</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="454"/>
@@ -3081,7 +3088,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="463"/>
         <source>SAC</source>
-        <translation>Spotřeba plynu</translation>
+        <translation>Spotřeba plynu (SAC)</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="466"/>
@@ -3093,7 +3100,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../qt-models/divetripmodel.cpp" line="469"/>
         <location filename="../qt-models/divetripmodel.cpp" line="520"/>
         <source>Max CNS</source>
-        <translation>Max. CNS</translation>
+        <translation>Max CNS</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="472"/>
@@ -3119,7 +3126,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="491"/>
         <source>ft</source>
-        <translation>st</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="497"/>
@@ -3129,7 +3136,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="500"/>
         <source>Weight(%1)</source>
-        <translation>Váha (%1)</translation>
+        <translation>Zátěž (%1)</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="500"/>
@@ -3139,7 +3146,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="500"/>
         <source>lbs</source>
-        <translation>libra US</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="514"/>
@@ -3154,7 +3161,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="523"/>
         <source>Photos before/during/after dive</source>
-        <translation type="unfinished"/>
+        <translation>Fotografie před/během/po ponoru</translation>
     </message>
 </context>
 <context>
@@ -3162,32 +3169,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
         <source>no dives were selected</source>
-        <translation>Nebyla vybrána žádná potápění</translation>
+        <translation>nebyly vybrány žádné ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
         <source>stylesheet to export to divelogs.de is not found</source>
-        <translation type="unfinished"/>
+        <translation>nebyl nalezen styl pro export do divelogs.de</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
         <source>failed to create zip file for upload: %s</source>
-        <translation>Nepodařilo se vytvořit soubor s archivem ve formátu zip pro nahrání: %s</translation>
+        <translation>nepodařilo se vytvořit soubor s archivem ve formátu zip pro nahrání: %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
         <source>internal error</source>
-        <translation>Vnitřní chyba</translation>
+        <translation>vnitřní chyba</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
         <source>Conversion of dive %1 to divelogs.de format failed</source>
-        <translation type="unfinished"/>
+        <translation>Konverze ponoru %1 do formátu divelogs.de selhala</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
         <source>error writing zip file: %s zip error %d system error %d - %s</source>
-        <translation type="unfinished"/>
+        <translation>chyba zápisu zip souboru: %s zip chyba %d systémová chyba %d - %s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
@@ -3198,17 +3205,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
         <source>Uploading dive list...</source>
-        <translation>Nahrává se seznam potápění...</translation>
+        <translation>Nahrává se seznam ponorů...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
         <source>Downloading dive list...</source>
-        <translation>Stahuje se seznam potápění...</translation>
+        <translation>Stahuje se seznam ponorů...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
         <source>Downloading %1 dives...</source>
-        <translation>Stahuje se %1 potápění...</translation>
+        <translation>Stahování %1 ponorů...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
@@ -3218,13 +3225,14 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
         <source>Problem with download</source>
-        <translation type="unfinished"/>
+        <translation>Problém se stahováním</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
         <source>The archive could not be opened:
 </source>
-        <translation type="unfinished"/>
+        <translation>Archiv nelze otevřít:
+</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
@@ -3241,17 +3249,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
         <source>Upload finished</source>
-        <translation>Přenos dokončen</translation>
+        <translation>Nahrávání dokončeno</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
         <source>Upload failed</source>
-        <translation>Přenos se nezdařil</translation>
+        <translation>Nahrávání selhalo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
         <source>Upload successful</source>
-        <translation>Přenos se zdařil</translation>
+        <translation>Nahrávání uspěšně dokončeno</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
@@ -3279,7 +3287,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
         <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
+        <translation>Vybrat režim Bluetooth stahování</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
@@ -3289,17 +3297,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
         <source>Find Uemis dive computer</source>
-        <translation>Najít potápecí počítač Uemis</translation>
+        <translation>Najít potápěčský počítač Uemis</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
         <source>Choose file for divecomputer download logfile</source>
-        <translation>Vyberte soubor ke stažení souboru se záznamem potápecího počítače</translation>
+        <translation>Vyberte log soubor pro stahování z potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
         <source>Log files (*.log)</source>
-        <translation>Soubory se záznamy (*.log)</translation>
+        <translation>Log soubory (*.log)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="414"/>
@@ -3309,17 +3317,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="415"/>
         <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
-        <translation type="unfinished"/>
+        <translation>Uložení libdivecomputer dumpu NEstáhne ponory do seznamu ponorů.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/>
         <source>Choose file for divecomputer binary dump file</source>
-        <translation>Vyberte soubor, do něhož se má ukládat soubor Dump potápecího počítače</translation>
+        <translation>Vyberte soubor pro binárná dump potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/>
         <source>Dump files (*.bin)</source>
-        <translation>Soubory Dump (*.bin)</translation>
+        <translation>Dump soubory (*.bin)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="452"/>
@@ -3332,7 +3340,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
         <source>Download from dive computer</source>
-        <translation>Stáhnout z potápecího počítače</translation>
+        <translation>Stáhnout z potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
@@ -3350,37 +3358,37 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="73"/>
         <source>Force download of all dives</source>
-        <translation>Vynutit opětovné stažení všech potápění</translation>
+        <translation>Vynutit opětovné stažení všech ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="80"/>
         <source>Always prefer downloaded dives</source>
-        <translation>Vždy dávat přednnost staženým potápěním</translation>
+        <translation>Vždy upřednostňovat stažené ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
         <source>Download into new trip</source>
-        <translation>Stáhnout do nové cesty</translation>
+        <translation>Stáhnout do nového výletu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
         <source>Save libdivecomputer logfile</source>
-        <translation>Uložit soubor se záznamem libdivecomputer</translation>
+        <translation>Uložit libdivecomputer log soubor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
         <source>Save libdivecomputer dumpfile</source>
-        <translation>Uložit soubor Dump přenosu libdivecomputer</translation>
+        <translation>Uložit libdivecomputer dump soubor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
         <source>Choose Bluetooth download mode</source>
-        <translation type="unfinished"/>
+        <translation>Vybrat režim Bluetooth stahování</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
         <source>Select a remote Bluetooth device.</source>
-        <translation type="unfinished"/>
+        <translation>Vyberte vzdálené Bluetooth zařízení.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
@@ -3390,7 +3398,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
         <source>Dive computer</source>
-        <translation>Potápecí počítač</translation>
+        <translation>Potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
@@ -3401,7 +3409,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
         <source>Downloaded dives</source>
-        <translation>Stažená potápění</translation>
+        <translation>Stažené ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="236"/>
@@ -3426,17 +3434,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
         <source>Dive Computer</source>
-        <translation type="unfinished"/>
+        <translation>Potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/>
         <source> Vendor name : </source>
-        <translation type="unfinished"/>
+        <translation>Název prodejce:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
         <source> Dive Computer:</source>
-        <translation type="unfinished"/>
+        <translation>Potápěčský počítač:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
@@ -3452,12 +3460,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
         <source> Downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Stažené ponory</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
         <source>Date / Time</source>
-        <translation type="unfinished"/>
+        <translation>Datum / Čas</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
@@ -3482,7 +3490,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
         <source>Unselect All</source>
-        <translation type="unfinished"/>
+        <translation>Odznačit vše</translation>
     </message>
 </context>
 <context>
@@ -3508,17 +3516,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/>
         <source>Connect to facebook text placeholder</source>
-        <translation type="unfinished"/>
+        <translation>Připojení na Facebook zástupný text</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="254"/>
         <source>To disconnect Subsurface from your Facebook account, use the &apos;Share on&apos; menu entry.</source>
-        <translation type="unfinished"/>
+        <translation>Pro odpojení Subsurface od Facebook účtu použijte menu „Sdílet na“.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="263"/>
         <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
-        <translation type="unfinished"/>
+        <translation>Pro připojení k Facebooku se prosím zalogujte. Tím umožníte Subsurface publikovat vaše ponory na vaší časové ose.</translation>
     </message>
 </context>
 <context>
@@ -3531,19 +3539,21 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="215"/>
         <source>Your dive profile was updated to Facebook.</source>
-        <translation>Váš potápěcí profil byl aktualizován na Facebooku.</translation>
+        <translation>Váš profil ponoru byl aktualizován na Facebooku.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="219"/>
         <source>Photo upload failed</source>
-        <translation>Nahrání fotografie se nezdařilo</translation>
+        <translation>Nahrání fotografie selhalo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="220"/>
         <source>Your dive profile was not updated to Facebook, 
  please send the following to the developer. 
 </source>
-        <translation type="unfinished"/>
+        <translation>Váš profil ponoru nebyl aktualizován na Facebooku,
+prosím odešlete následující vývojářům.
+</translation>
     </message>
 </context>
 <context>
@@ -3577,17 +3587,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/filterwidget.ui" line="73"/>
         <source>Reset filters</source>
-        <translation>Nastavit filtry znovu</translation>
+        <translation>Obnovit nastavení filtrů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/filterwidget.ui" line="87"/>
         <source>Show/hide filters</source>
-        <translation>Ukázat/Skrýt filtry</translation>
+        <translation>Ukázat/skrýt filtry</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/filterwidget.ui" line="101"/>
         <source>Close and reset filters</source>
-        <translation>Zavřít filtry a nastavit znovu</translation>
+        <translation>Zavřít a obnovit filtry</translation>
     </message>
 </context>
 <context>
@@ -3595,7 +3605,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
         <source>This feature is not yet available for the selected dive computer.</source>
-        <translation>Tato funkce ještě není pro vybraný potápěcí počítač dostupná.</translation>
+        <translation>Tato funkce ještě není pro vybraný potápěčský počítač dostupná.</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/>
@@ -3608,7 +3618,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/>
         <source>Back</source>
-        <translation type="unfinished"/>
+        <translation>Zpět</translation>
     </message>
 </context>
 <context>
@@ -3616,7 +3626,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="124"/>
         <source>Edit selected dive locations</source>
-        <translation>Upravit vybraná místa potápění</translation>
+        <translation>Upravit vybrané potápěčské lokality</translation>
     </message>
 </context>
 <context>
@@ -3624,7 +3634,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/>
         <source>GPS Fixes</source>
-        <translation type="unfinished"/>
+        <translation>GPS pozice</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
@@ -3639,17 +3649,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Zeměpisná šířka:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Zeměpisná délka:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
         <source>List of stored GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Seznam uložených GPS pozic</translation>
     </message>
 </context>
 <context>
@@ -3657,7 +3667,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../core/gpslocation.cpp" line="121"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Neznámá GPS pozice</translation>
     </message>
 </context>
 <context>
@@ -3670,7 +3680,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/>
         <source>Close message</source>
-        <translation type="unfinished"/>
+        <translation>Zavřít zprávu</translation>
     </message>
 </context>
 <context>
@@ -3686,32 +3696,32 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="497"/>
         <source> (same GPS fix)</source>
-        <translation type="unfinished"/>
+        <translation>(stejná GPS pozice)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/>
         <source> (~%1 away</source>
-        <translation type="unfinished"/>
+        <translation>(~%1 pryč</translation>
     </message>
     <message numerus="yes">
         <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/>
         <source>, %n dive(s) here)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>, %n ponor(ů) zde)</numerusform><numerusform>, %n ponor(ů) zde)</numerusform><numerusform>, %n ponor(ů) zde)</numerusform></translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/>
         <source>(no existing GPS data, add GPS fix from this dive)</source>
-        <translation type="unfinished"/>
+        <translation>(žádná existující GPS data, přidat GPS pozici z tohoto ponoru)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="510"/>
         <source>(no GPS data)</source>
-        <translation type="unfinished"/>
+        <translation>(žádná GPS data)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/modeldelegates.cpp" line="512"/>
         <source>Pick site: </source>
-        <translation type="unfinished"/>
+        <translation>Vyberte lokalitu:</translation>
     </message>
 </context>
 <context>
@@ -3719,7 +3729,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/filtermodels.cpp" line="304"/>
         <source>No location set</source>
-        <translation>Nestanoveno žádné místo</translation>
+        <translation>Není nastaveno žádné místo</translation>
     </message>
 </context>
 <context>
@@ -3752,7 +3762,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/locationInformation.ui" line="69"/>
         <source>Reverse geo lookup</source>
-        <translation type="unfinished"/>
+        <translation>Reverzní geo vyhledávání</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationInformation.ui" line="72"/>
@@ -3762,12 +3772,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/locationInformation.ui" line="93"/>
         <source>Dive sites on same coordinates</source>
-        <translation type="unfinished"/>
+        <translation>Potápěčské lokality na stejných souřadnicích</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationInformation.ui" line="131"/>
         <source>Tags</source>
-        <translation>Značky</translation>
+        <translation>Tagy</translation>
     </message>
 </context>
 <context>
@@ -3775,7 +3785,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divelocationmodel.cpp" line="68"/>
         <source>Create dive site with this name</source>
-        <translation type="unfinished"/>
+        <translation>Vytvořit potápěčskou lokalitu s tímto názvem</translation>
     </message>
 </context>
 <context>
@@ -3794,28 +3804,29 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/locationinformation.cpp" line="31"/>
         <location filename="../desktop-widgets/locationinformation.cpp" line="217"/>
         <source>Dive site management</source>
-        <translation type="unfinished"/>
+        <translation>Správa potápěčských lokalit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="63"/>
         <source>Merge into current site</source>
-        <translation type="unfinished"/>
+        <translation>Sloučit do současné lokality</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="72"/>
         <source>Merging dive sites</source>
-        <translation type="unfinished"/>
+        <translation>Slučování potápěčských lokalit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="73"/>
         <source>You are about to merge dive sites, you can't undo that action 
  Are you sure you want to continue?</source>
-        <translation type="unfinished"/>
+        <translation>Chystáte se sloučit potápěčské lokality, tuto akci nelze vrátit
+Jste si jisti, že chcete pokračovat?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/locationinformation.cpp" line="224"/>
         <source>You are editing a dive site</source>
-        <translation type="unfinished"/>
+        <translation>Editujete potápěčskou lokalitu</translation>
     </message>
 </context>
 <context>
@@ -3824,7 +3835,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
         <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
         <source>Application Log</source>
-        <translation type="unfinished"/>
+        <translation>Aplikační log</translation>
     </message>
 </context>
 <context>
@@ -3840,7 +3851,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="21"/>
         <source>General notes about the current selection</source>
-        <translation type="unfinished"/>
+        <translation>Obecné poznámky o současném výběru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="92"/>
@@ -3876,7 +3887,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="214"/>
         <source>Edit dive site</source>
-        <translation type="unfinished"/>
+        <translation>Upravit potápěčskou lokalitu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="217"/>
@@ -3886,12 +3897,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="252"/>
         <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="262"/>
         <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="308"/>
@@ -3926,22 +3937,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="494"/>
         <source>Used equipment in the current selection</source>
-        <translation type="unfinished"/>
+        <translation>Použitá výstroj v současném výběru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="586"/>
         <source>Info</source>
-        <translation type="unfinished"/>
+        <translation>Informace</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="589"/>
         <source>Dive information</source>
-        <translation>Informace o potápění</translation>
+        <translation>Informace o ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="665"/>
         <source>Interval</source>
-        <translation>Hladinová přestávka</translation>
+        <translation>Interval</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="684"/>
@@ -3951,13 +3962,13 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="703"/>
         <source>Gas consumed</source>
-        <translation>Spotřeba plynu</translation>
+        <translation>Spotřebovaný plyn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="722"/>
         <location filename="../desktop-widgets/maintab.ui" line="1094"/>
         <source>SAC</source>
-        <translation>Spotřeba plynu</translation>
+        <translation>Spotřeba plynu (SAC)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="741"/>
@@ -3987,22 +3998,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="874"/>
         <source>Dive time</source>
-        <translation>Doba trvání potápění</translation>
+        <translation>Doba ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="893"/>
         <source>Salinity</source>
-        <translation>Obsah soli</translation>
+        <translation>Salinita</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="930"/>
         <source>Stats</source>
-        <translation>Statistika</translation>
+        <translation>Statistiky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="933"/>
         <source>Simple statistics about the selection</source>
-        <translation type="unfinished"/>
+        <translation>Jednoduchá statistika současného výběru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="986"/>
@@ -4027,7 +4038,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1058"/>
         <source>Dives</source>
-        <translation>Potápění</translation>
+        <translation>Ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1106"/>
@@ -4042,7 +4053,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1151"/>
         <source>All photos from the current selection</source>
-        <translation type="unfinished"/>
+        <translation>Všechny fotografie současného výběru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1177"/>
@@ -4052,7 +4063,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="1180"/>
         <source>Adittional data from the dive computer</source>
-        <translation type="unfinished"/>
+        <translation>Dodatečná data z potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4067,22 +4078,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="88"/>
         <source>Cylinders</source>
-        <translation>Láhve</translation>
+        <translation>Lahve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="89"/>
         <source>Add cylinder</source>
-        <translation>Přidat láhev</translation>
+        <translation>Přidat lahev</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="92"/>
         <source>Weights</source>
-        <translation>Olovo</translation>
+        <translation>Zátěž</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="93"/>
         <source>Add weight system</source>
-        <translation>Přidat závaží</translation>
+        <translation>Přidat zátěž</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="97"/>
@@ -4102,7 +4113,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>Freedive</source>
-        <translation type="unfinished"/>
+        <translation>Freedive</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="303"/>
@@ -4117,23 +4128,23 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="343"/>
         <source>This trip is being edited.</source>
-        <translation>Tato cesta se upravuje.</translation>
+        <translation>Tento výlet je editován.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="350"/>
         <source>Multiple dives are being edited.</source>
-        <translation>Upravuje se vícero potápění.</translation>
+        <translation>Je editováno více ponorů.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="352"/>
         <source>This dive is being edited.</source>
-        <translation>Toto potápění se upravuje.</translation>
+        <translation>Tento ponor je editován.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="501"/>
         <location filename="../desktop-widgets/maintab.cpp" line="534"/>
         <source>Trip notes</source>
-        <translation>Poznámky o cestě</translation>
+        <translation>Poznámky k výletu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="529"/>
@@ -4151,27 +4162,27 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="641"/>
         <source>Deepest dive</source>
-        <translation>Nejhlubší potápění</translation>
+        <translation>Nejhlubší ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="642"/>
         <source>Shallowest dive</source>
-        <translation>Nejméně hluboké potápění</translation>
+        <translation>Nejmělčí ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="655"/>
         <source>Highest total SAC of a dive</source>
-        <translation>Nejvyšší celková spotřeba plynu (SAC) potápění</translation>
+        <translation>Nejvyšší celková spotřeba plynu (SAC) při ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="656"/>
         <source>Lowest total SAC of a dive</source>
-        <translation>Nejnižší celková spotřeba plynu (SAC) potápění</translation>
+        <translation>Nejnižší celková spotřeba plynu (SAC) při ponorou</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="657"/>
         <source>Average total SAC of all selected dives</source>
-        <translation>Průměrná celková spotřeba plynu (SAC) všech vybraných potápění</translation>
+        <translation>Průměrná celková spotřeba plynu (SAC) všech vybraných ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="668"/>
@@ -4186,22 +4197,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="670"/>
         <source>Average temperature of all selected dives</source>
-        <translation>Průměrná teplota všech vybraných potápění</translation>
+        <translation>Průměrná teplota všech vybraných ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="683"/>
         <source>Longest dive</source>
-        <translation>Nejdelší potápění</translation>
+        <translation>Nejdelší ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="684"/>
         <source>Shortest dive</source>
-        <translation>Nejkratší potápění</translation>
+        <translation>Nejkratší ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="685"/>
         <source>Average length of all selected dives</source>
-        <translation>Průměrná délka všech vybraných potápění</translation>
+        <translation>Průměrná délka všech vybraných ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="709"/>
@@ -4219,7 +4230,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="843"/>
         <source>New dive site</source>
-        <translation type="unfinished"/>
+        <translation>Nová potápěčská lokalita</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1139"/>
@@ -4234,12 +4245,12 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Deleting Images</source>
-        <translation type="unfinished"/>
+        <translation>Mazání obrázků</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Are you sure you want to delete all images?</source>
-        <translation type="unfinished"/>
+        <translation>Opravdu chcete smazat všechny obrázky?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
@@ -4249,17 +4260,17 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1654"/>
         <source>Load image(s) from web</source>
-        <translation>Nahrát obrázek(y) z internetu</translation>
+        <translation>Nahrát obrázek(y) z webu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
         <source>Delete selected images</source>
-        <translation type="unfinished"/>
+        <translation>Smazat vybrané obrázky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
         <source>Delete all images</source>
-        <translation type="unfinished"/>
+        <translation>Smazat všechny obrázky</translation>
     </message>
 </context>
 <context>
@@ -4287,22 +4298,22 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
         <source>&amp;Import</source>
-        <translation>Za&amp;vedení</translation>
+        <translation>&amp;Import</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
         <source>&amp;Edit</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Editovat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
         <source>Share on</source>
-        <translation type="unfinished"/>
+        <translation>Sdílet na</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
         <source>&amp;New logbook</source>
-        <translation>&amp;Nová záznamní kniha</translation>
+        <translation>&amp;Nový deník</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
@@ -4317,7 +4328,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
         <source>&amp;Open logbook</source>
-        <translation>&amp;Otevřít záznamní knihu</translation>
+        <translation>&amp;Otevřít deník</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
@@ -4408,7 +4419,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
         <source>Import from &amp;dive computer</source>
-        <translation>Zavést z p&amp;otápecího počítače</translation>
+        <translation>Importovat z potápěčského počítače</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
@@ -4418,7 +4429,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
         <source>Import &amp;GPS data from Subsurface web service</source>
-        <translation>Zavedení dat &amp;GPS ze stránek Subsurface</translation>
+        <translation>Importovat &amp;GPS data z webu Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
@@ -4428,12 +4439,12 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
         <source>Edit device &amp;names</source>
-        <translation type="unfinished"/>
+        <translation>Editovat zařízení a &amp;názvy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
         <source>&amp;Add dive</source>
-        <translation>&amp;Přidat potápění</translation>
+        <translation>&amp;Přidat ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
@@ -4443,12 +4454,12 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
         <source>&amp;Edit dive</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Editovat ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
         <source>&amp;Copy dive components</source>
-        <translation>&amp;Kopírovat součásti potápění</translation>
+        <translation>&amp;Kopírovat data ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
@@ -4458,7 +4469,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
         <source>&amp;Paste dive components</source>
-        <translation>&amp;Vložit součásti potápění</translation>
+        <translation>&amp;Vložit data ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
@@ -4493,7 +4504,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
         <source>&amp;Dive list</source>
-        <translation>S&amp;eznam potápění</translation>
+        <translation>S&amp;eznam ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
@@ -4533,7 +4544,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
         <source>P&amp;revious DC</source>
-        <translation>&amp;Předchozí PP</translation>
+        <translation>&amp;Předchozí potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
@@ -4543,7 +4554,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
         <source>&amp;Next DC</source>
-        <translation>&amp;Další PP</translation>
+        <translation>&amp;Následující potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
@@ -4568,7 +4579,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
         <source>&amp;Globe</source>
-        <translation>Země&amp;koule</translation>
+        <translation>&amp;Globus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
@@ -4578,7 +4589,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
         <source>P&amp;lan dive</source>
-        <translation>&amp;Naplánovat potápění</translation>
+        <translation>&amp;Naplánovat ponor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
@@ -4588,12 +4599,12 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
         <source>&amp;Import log files</source>
-        <translation>&amp;Zavést soubory se záznamy</translation>
+        <translation>&amp;Importovat log soubory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
         <source>Import divelog files from other applications</source>
-        <translation>Zavést soubory se záznamy o potápění z jiných programů</translation>
+        <translation>Importovat soubory potápěčského deníku z jiné aplikace</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
@@ -4603,7 +4614,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
         <source>Import &amp;from divelogs.de</source>
-        <translation>&amp;Zavést z divelogs.de</translation>
+        <translation>Importovat &amp;z divelogs.de</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
@@ -4628,12 +4639,12 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
         <source>&amp;Export</source>
-        <translation>&amp;Vyvést</translation>
+        <translation>&amp;Exportovat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
         <source>Export dive logs</source>
-        <translation>Vyvést soubory se záznamy o potápění</translation>
+        <translation>Exportovat potápěčský deník</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
@@ -4643,7 +4654,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
         <source>Configure &amp;dive computer</source>
-        <translation>Nastavit &amp;potápěcí počítač</translation>
+        <translation>Nastavit &amp;potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
@@ -4653,92 +4664,92 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
         <source>Edit &amp;dive in planner</source>
-        <translation type="unfinished"/>
+        <translation>E&amp;ditovat ponor v plánovači</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
         <source>Toggle pO₂ graph</source>
-        <translation>Přepnout nákres pO₂</translation>
+        <translation>Zobrazit pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
         <source>Toggle pN₂ graph</source>
-        <translation>Přepnout nákres pN₂</translation>
+        <translation>Zobrazit pN₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
         <source>Toggle pHe graph</source>
-        <translation>Zapnout/Vypnout křivku pHe</translation>
+        <translation>Zobrazit pHe</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
         <source>Toggle DC reported ceiling</source>
-        <translation>Zapnout/Vypnout potápěcí počítač pro horní mez (hranici vynoření)</translation>
+        <translation>Zobrazit strop vypočtený potápěčských počítačem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
         <source>Toggle calculated ceiling</source>
-        <translation>Zapnout/Vypnout vypočítanou horní mez (hranici vynoření)</translation>
+        <translation>Zobrazit vypočtený strop</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
         <source>Toggle calculating all tissues</source>
-        <translation>Zapnout/Vypnout výpočet všech tkání</translation>
+        <translation>Zobrazit výpočet všech tkání</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
         <source>Toggle calculated ceiling with 3m increments</source>
-        <translation>Zapnout/Vypnout vypočítanou horní mez (hranici vynoření) v 3 m krocích</translation>
+        <translation>Zobrazit vypočtený strop s 3m nárůstky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
         <source>Toggle heart rate</source>
-        <translation>Zapnout/Vypnout srdeční rytmus</translation>
+        <translation>Zobrazit tepovou frekvenci</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
         <source>Toggle MOD</source>
-        <translation>Zapnout/Vypnout MOD</translation>
+        <translation>Zobrazit MOD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
         <source>Toggle EAD, END, EADD</source>
-        <translation>Zapnout/Vypnout EAD, END, EADD</translation>
+        <translation>Zobrazit EAD, END, EADD</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
         <source>Toggle NDL, TTS</source>
-        <translation>Zapnout/Vypnout nulový čas, celkový čas výstupu</translation>
+        <translation>Zobrazit NDL, TTS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
         <source>Toggle SAC rate</source>
-        <translation>Prepnout spotřebu plynu (SAC)</translation>
+        <translation>Zobrazit rychlost spotřeby plynu (SAC rate)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
         <source>Toggle ruler</source>
-        <translation>Zapnout/Vypnout pravítko</translation>
+        <translation>Zobrazit pravítko</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
         <source>Scale graph</source>
-        <translation>Měřítko grafu</translation>
+        <translation>Změnit velikost grafu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
         <source>Toggle pictures</source>
-        <translation>Přepnout obrázky</translation>
+        <translation>Zobrazit obrázky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
         <source>Toggle tank bar</source>
-        <translation>Přepnout pruh s nádrží</translation>
+        <translation>Zobrazit pruh lahví</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
         <source>&amp;Filter divelist</source>
-        <translation>&amp;Filtrovat seznam potápění</translation>
+        <translation>&amp;Filtrovat seznam ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
@@ -4748,7 +4759,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
         <source>Toggle tissue heat-map</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazit heat mapu tkání</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
@@ -4759,48 +4770,48 @@ ze vzduchu a následujících plynů:</translation>
         <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
         <source>&amp;Undo</source>
-        <translation type="unfinished"/>
+        <translation>Zpět</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
         <source>Ctrl+Z</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Z</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="233"/>
         <source>&amp;Redo</source>
-        <translation type="unfinished"/>
+        <translation>Znovu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
         <source>Ctrl+Shift+Z</source>
-        <translation type="unfinished"/>
+        <translation>Ctrl+Shift+Z</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
         <source>&amp;Find moved images</source>
-        <translation type="unfinished"/>
+        <translation>Nalézt přesunuté obrázky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
         <source>Open c&amp;loud storage</source>
-        <translation type="unfinished"/>
+        <translation>Otevřít c&amp;loudové úložiště</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
         <source>Save to clo&amp;ud storage</source>
-        <translation type="unfinished"/>
+        <translation>Uložit do clo&amp;udového úložiště</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
         <source>&amp;Manage dive sites</source>
-        <translation type="unfinished"/>
+        <translation>Správa potápěčských lokalit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
         <source>Dive Site &amp;Edit</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Editace potápěčské lokality</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
@@ -4810,25 +4821,25 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
         <source>Take cloud storage online</source>
-        <translation type="unfinished"/>
+        <translation>Online připojení ke cloudovému úložišti.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="332"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="363"/>
         <source>Connect to</source>
-        <translation type="unfinished"/>
+        <translation>Připojit k</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="358"/>
         <source>Disconnect from</source>
-        <translation type="unfinished"/>
+        <translation>Odpojit od</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="506"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="551"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
-        <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před otevřením nového souboru.</translation>
+        <translation>Před otevřením nového souboru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="512"/>
@@ -4845,7 +4856,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="623"/>
         <source>Traverse image directories</source>
-        <translation type="unfinished"/>
+        <translation>Procházet adresáře obrázků</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="626"/>
@@ -4855,7 +4866,7 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="634"/>
         <source>Scanning images...(this can take a while)</source>
-        <translation type="unfinished"/>
+        <translation>Prohledávání obrázků... (může trvat delší dobu)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="662"/>
@@ -4870,33 +4881,33 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="687"/>
         <source>Please save or cancel the current dive edit before closing the file.</source>
-        <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před zavřením souboru.</translation>
+        <translation>Před zavřením souboru přosím uložte, nebo zrušte nynější úpravy ponoru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="809"/>
         <source>Please save or cancel the current dive edit before trying to add a dive.</source>
-        <translation>Uložte, prosím, nebo zrušte nynější upravování potápění před pokusem o přidání potápění.</translation>
+        <translation>Před přidáním ponoru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="861"/>
         <source>Print runtime table</source>
-        <translation>Vypsat provozní tabulku</translation>
+        <translation>Vypsat tabulku koncových časů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="917"/>
         <source>Trying to replan a dive that&apos;s not a planned dive.</source>
-        <translation type="unfinished"/>
+        <translation>Pokus o přeplánování ponoru, který není plánem ponoru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Please, first finish the current edition before trying to do another.</source>
-        <translation>Nejprve, prosím, skončete nynější upravování před pokusem o provádění dalších úprav.</translation>
+        <translation>Před prováděním dalších úprav dokončete stávající úpravy.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
-        <translation type="unfinished"/>
+        <translation>Pokus o úpravu ponoru, který není ručně zadaným ponorem.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/>
@@ -4931,43 +4942,44 @@ ze vzduchu a následujících plynů:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Soubory Subsurface XML (*.ssrf *.xml *.XML)</translation>
+        <translation>Subsurface XML soubory (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
         <source>[local cache for] %1</source>
-        <translation type="unfinished"/>
+        <translation>[lokální cache pro] %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/>
         <source>[cloud storage for] %1</source>
-        <translation type="unfinished"/>
+        <translation>[cloudové úložiště pro] %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/>
         <source>Opening datafile from older version</source>
-        <translation type="unfinished"/>
+        <translation>Otevírání datového souboru ze starší verze</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/>
         <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"/>
+        <translation>Otevřeli jste datový soubor starší verze Subsurface. Doporučujeme vám přečíst manuál, abyste zjistili změny v nové verzi, zvláště o správě potápěčských lokalit, která se značně změnila.
+Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se na systém nové správy potápěčských lokalit a ujistit se, že vše vypadá správně.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/>
         <source>Open dive log file</source>
-        <translation>Otevřít soubor se záznamem o potápění</translation>
+        <translation>Otevřít soubor potápěčského deníku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Soubory potápěčských deníků (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran soubory (*.can *.CAN);;CSV soubory (*.csv *.CSV);;DiveLog.de soubory (*.dld *.DLD);;JDiveLog soubory (*.jlb *.JLB);;Liquivision soubory (*.lvd *.LVD);;MkVI soubory (*.txt *.TXT);;Suunto soubory (*.sde *.db *.SDE *.DB);;Divesoft soubory (*.dlf *.DLF);;UDDF/UDCF soubory (*.uddf *.udcf *.UDDF *.UDCF);;XML soubory (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog soubory (*.log *.LOG);;OSTCtools soubory (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Všechny soubory (*)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Contacting cloud service...</source>
-        <translation type="unfinished"/>
+        <translation>Spojení s cloudovou službou...</translation>
     </message>
 </context>
 <context>
@@ -4975,7 +4987,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="737"/>
         <source>Filter shows %1 (of %2) dives</source>
-        <translation>Filtr ukazuje %1 (z %2) potápění</translation>
+        <translation>Filtr zobrazuje %1 (z(e) %2) ponoru(ů)</translation>
     </message>
 </context>
 <context>
@@ -4983,14 +4995,16 @@ Subsurface has already tried to pre-populate the data but it might be worth whil
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="289"/>
         <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
-        <translation type="unfinished"/>
+        <translation>Měli byste aktualizovat firmware vašeho potápěčského počítače: máte verzi %1 ale poslední stabilní verze je %2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="292"/>
         <source>
 
 If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source>
-        <translation type="unfinished"/>
+        <translation>
+
+Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako pro stažení deníku před pokračováním aktualizace</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="293"/>
@@ -5005,7 +5019,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
         <source>Firmware upgrade notice</source>
-        <translation>Upozornění na aktualizaci firmware</translation>
+        <translation>Upozornění aktualizace firmware</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="314"/>
@@ -5015,7 +5029,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="315"/>
         <source>Firmware files (*.hex *.bin)</source>
-        <translation type="unfinished"/>
+        <translation>Firmware soubory (*.hex *.bin)</translation>
     </message>
 </context>
 <context>
@@ -5023,7 +5037,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="312"/>
         <source>Open circuit</source>
-        <translation type="unfinished"/>
+        <translation>Otevřený okruh</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="312"/>
@@ -5038,27 +5052,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
         <source>ft/min</source>
-        <translation>stop/min</translation>
+        <translation>ft/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="399"/>
         <source>Last stop at 20ft</source>
-        <translation>Poslední zastavení v 20 stopách</translation>
+        <translation>Poslední zastávka ve 20 stopách</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="400"/>
         <source>50% avg. depth to 20ft</source>
-        <translation>50 % průměrná hloubka do 20 stop</translation>
+        <translation>50 % průměrné hloubky do 20 stop</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
         <source>20ft to surface</source>
-        <translation>20 stop k hladině</translation>
+        <translation>20 stop na hladinu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
         <source>ft</source>
-        <translation>st</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="404"/>
@@ -5068,17 +5082,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="405"/>
         <source>Last stop at 6m</source>
-        <translation>Poslední zastavení v 6 metrech</translation>
+        <translation>Poslední zastávka v 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="406"/>
         <source>50% avg. depth to 6m</source>
-        <translation>50 % průměrná hloubka do 6 metrů</translation>
+        <translation>50 % průměrné hloubky do 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="407"/>
         <source>6m to surface</source>
-        <translation>6 metrů k hladině</translation>
+        <translation>6 m na hladinu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="408"/>
@@ -5089,7 +5103,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
         <location filename="../desktop-widgets/diveplanner.cpp" line="412"/>
         <source>cuft/min</source>
-        <translation>cu st/min</translation>
+        <translation>cuft/min</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
@@ -5124,17 +5138,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="43"/>
         <source>Subsurface GPS data webservice</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface GPS webová služba</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="51"/>
         <source>Distance threshold (meters)</source>
-        <translation type="unfinished"/>
+        <translation>Práh vzdálenosti (metry)</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/Preferences.qml" line="62"/>
         <source>Time threshold (minutes)</source>
-        <translation type="unfinished"/>
+        <translation>Práh času (minuty)</translation>
     </message>
 </context>
 <context>
@@ -5162,32 +5176,32 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="52"/>
         <source>Dives</source>
-        <translation>Potápění</translation>
+        <translation>Ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="67"/>
         <source>Default dive log file</source>
-        <translation>Výchozí soubor se záznamem o potápění</translation>
+        <translation>Výchozí soubor s potápěčským deníkem</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="76"/>
         <source>No default file</source>
-        <translation type="unfinished"/>
+        <translation>Žádný výchozí soubor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="83"/>
         <source>&amp;Local default file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Lokální výchozí soubor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="90"/>
         <source>Clo&amp;ud storage default file</source>
-        <translation type="unfinished"/>
+        <translation>Výchozí soubor clo&amp;udového úložiště</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="99"/>
         <source>Local dive log file</source>
-        <translation type="unfinished"/>
+        <translation>Lokální potápěčský deník</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="111"/>
@@ -5207,12 +5221,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
         <source>Default cylinder</source>
-        <translation>Standardní láhev</translation>
+        <translation>Výchozí lahev</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
         <source>Use default cylinder</source>
-        <translation>Použít standardní láhev</translation>
+        <translation>Použít výchozí lahev</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="179"/>
@@ -5232,7 +5246,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/>
         <source>Reset all settings to their default value</source>
-        <translation>Nastavit všechna nastavení na jejich výchozí hodnotu</translation>
+        <translation>Nastavit všechna nastavení na jejich výchozí hodnoty</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/>
@@ -5242,12 +5256,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
         <source>Open default log file</source>
-        <translation>Otevřít výchozí soubor se záznamem</translation>
+        <translation>Otevřít výchozí log soubor</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
-        <translation>Soubory XML Subsurface (*.ssrf *.xml *.XML)</translation>
+        <translation>Subsurface XML soubory (*.ssrf *.xml *.XML)</translation>
     </message>
 </context>
 <context>
@@ -5260,38 +5274,38 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/>
         <source>Dive site geo lookup</source>
-        <translation type="unfinished"/>
+        <translation>Geo vyhledávání potápěčské lokality</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/>
         <source>Enable geocoding for dive site management</source>
-        <translation type="unfinished"/>
+        <translation>Povolit geokódování pro správu potápěčských lokalit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/>
         <source>Parse site without GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Parsovat lokalitu bez GPS dat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/>
         <source>Same format for existing dives</source>
-        <translation type="unfinished"/>
+        <translation>Stejný formát pro existující ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/>
         <source>Dive Site Layout</source>
-        <translation type="unfinished"/>
+        <translation>Rozvržení potápěčské lokality</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/>
         <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/>
         <source>/</source>
-        <translation type="unfinished"/>
+        <translation>/</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_georeference.cpp" line="10"/>
         <source>Georeference</source>
-        <translation type="unfinished"/>
+        <translation>Georeference</translation>
     </message>
 </context>
 <context>
@@ -5304,82 +5318,82 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
         <source>Gas pressure display setup</source>
-        <translation type="unfinished"/>
+        <translation>Nastavení zobrazení tlaku plynu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
         <source>Threshold for pO₂ (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Práh pro pO₂ (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
         <source>Threshold for pN₂ (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Práh pro pN₂ (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
         <source>Threshold for pHe (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Práh pro pHe (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
         <source>pO₂ in calculating MOD (bar)</source>
-        <translation type="unfinished"/>
+        <translation>pO₂ ve výpočtu MOD (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
         <source>CCR options:</source>
-        <translation type="unfinished"/>
+        <translation>CCR možnosti:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
         <source>Dive planner default setpoint (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Výchozí setpoint (bar) plánovače ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
         <source>Show setpoints when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazit setpointy při zobrazení pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
         <source>Show individual O₂ sensor values when viewing pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazit individuální hodnoty senzoru O₂ při zobrazení pO₂</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
         <source>Ceiling display setup</source>
-        <translation type="unfinished"/>
+        <translation>Nastavení zobrazení stropu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
         <source>Draw dive computer reported ceiling red</source>
-        <translation>Kreslit hranici potápění potápěcího počítače červenou barvou</translation>
+        <translation>Vykreslit strop vypočtený potápěčským počítačem červeně</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
         <source>Algorithm for calculated ceiling:</source>
-        <translation type="unfinished"/>
+        <translation>Algoritmus pro výpočet stropu:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
         <source>VPM-B</source>
-        <translation type="unfinished"/>
+        <translation>VPM-B</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
         <source>VPM-B Conservatism</source>
-        <translation type="unfinished"/>
+        <translation>VPM-B konzervatismus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
         <source>+</source>
-        <translation type="unfinished"/>
+        <translation>+</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
         <source>Bühlmann</source>
-        <translation type="unfinished"/>
+        <translation>Bühlmann</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
@@ -5394,22 +5408,22 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
         <source>GFLow at max depth</source>
-        <translation>Použít GFLow při největší hloubce</translation>
+        <translation>GFLow v největší hloubce</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
         <source>pSCR options:</source>
-        <translation type="unfinished"/>
+        <translation>pSCR možnosti:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
         <source>Metabolic rate (ℓ O₂/min)</source>
-        <translation type="unfinished"/>
+        <translation>Metabolická rychlost (ℓ O₂/min)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
         <source>Dilution ratio</source>
-        <translation type="unfinished"/>
+        <translation>Poměr ředění</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
@@ -5424,17 +5438,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
         <source>Show unused cylinders in Equipment tab</source>
-        <translation>Ukázat nepoužité láhve na kartě s výstrojí</translation>
+        <translation>Zobrazit nepoužité lahve na kartě s výstrojí</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
         <source>Show mean depth in Profile</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazit střední hodnotu hloubky v profilu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
         <source>Graph</source>
-        <translation>Nákres</translation>
+        <translation>Graf</translation>
     </message>
 </context>
 <context>
@@ -5447,12 +5461,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="26"/>
         <source>UI language</source>
-        <translation type="unfinished"/>
+        <translation>Jazyk uživatelského rozhraní</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
         <source>Use system default</source>
-        <translation type="unfinished"/>
+        <translation>Použít systémový výchozí</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
@@ -5462,28 +5476,28 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="74"/>
         <source>Date format</source>
-        <translation>Formát data</translation>
+        <translation>Formát datumu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Upřednostňovaný formát datumu. Běžně používaná pole jsou&lt;/p&gt;&lt;p&gt;d (den měsíce)&lt;/p&gt;&lt;p&gt;ddd (zkratka názvu dne)&lt;/p&gt;&lt;p&gt;M (číslo měsíce)&lt;/p&gt;&lt;p&gt;MMM (zkratka názvu dne)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 cifry rok)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
         <source>Use UI language default</source>
-        <translation type="unfinished"/>
+        <translation>Použít výchozí jazyk uživatelského rozhraní</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
         <source>This is used in places where there is less space to show the full date</source>
-        <translation type="unfinished"/>
+        <translation>Použito na místech, kde je málo místo pro zobrazení celého datumu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
         <source>Short format</source>
-        <translation type="unfinished"/>
+        <translation>Krátký formát</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
@@ -5493,7 +5507,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred time format&lt;/p&gt;&lt;p&gt;Commonly used format specifiers are&lt;/p&gt;&lt;p&gt;h (hours in 12h format)&lt;/p&gt;&lt;p&gt;H (hours in 24h format)&lt;/p&gt;&lt;p&gt;mm (2 digit minutes)&lt;/p&gt;&lt;p&gt;ss (2 digit seconds)&lt;/p&gt;&lt;p&gt;t/tt (a/p or am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Upřednostňovaný formát času&lt;/p&gt;&lt;p&gt;Běžně používané specifikátory formátu jsou&lt;/p&gt;&lt;p&gt;h (hodiny v 12h formátu)&lt;/p&gt;&lt;p&gt;H (hodiny v 24h formátu)&lt;/p&gt;&lt;p&gt;mm (2 cifry minuty)&lt;/p&gt;&lt;p&gt;ss (2 cifry sekundy)&lt;/p&gt;&lt;p&gt;t/tt (a/p nebo am/pm)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="12"/>
@@ -5503,18 +5517,18 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
         <source>Restart required</source>
-        <translation>Vyžadováno znovuspuštění</translation>
+        <translation>Vyžaduje restart</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
         <source>To correctly load a new language you must restart Subsurface.</source>
-        <translation>Pro nahrání nového jazyka se musí program Subsurface spustit znovu.</translation>
+        <translation>Pro nahrání nového jazyka je nutno restartovat program Subsurface.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
         <source>Literal characters</source>
-        <translation type="unfinished"/>
+        <translation>Doslovné znaky</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
@@ -5522,7 +5536,9 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <source>Non-special character(s) in time format.
 These will be used as is. This might not be what you intended.
 See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
-        <translation type="unfinished"/>
+        <translation>Ne-speciální znak(y) ve formátu času.
+Tyto znaky budou použity tak, jak jsou.  To nemusel být váš záměr.
+Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
     </message>
 </context>
 <context>
@@ -5540,12 +5556,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="32"/>
         <source>Port</source>
-        <translation>Přípojka</translation>
+        <translation>Port</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="39"/>
         <source>Host</source>
-        <translation>Hostitel</translation>
+        <translation>Host</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="46"/>
@@ -5572,47 +5588,47 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
         <source>Subsurface cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Cloudové úložiště Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="165"/>
         <source>Email address</source>
-        <translation type="unfinished"/>
+        <translation>E-mailová adresa</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="179"/>
         <source>Verification PIN</source>
-        <translation type="unfinished"/>
+        <translation>Ověřovací PIN</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="186"/>
         <source>New password</source>
-        <translation type="unfinished"/>
+        <translation>Nové heslo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/>
         <source>Sync to cloud in the background?</source>
-        <translation type="unfinished"/>
+        <translation>Synchronizovat s cloudem na pozadí?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="228"/>
         <source>Save Password locally?</source>
-        <translation type="unfinished"/>
+        <translation>Uložit heslo lokálně?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="238"/>
         <source>Subsurface web service</source>
-        <translation>Internetová služba Subsurface</translation>
+        <translation>Webová služba Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="250"/>
         <source>Default user ID</source>
-        <translation>Výchozí označení uživatele</translation>
+        <translation>Výchozí ID uživatele</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.ui" line="260"/>
         <source>Save user ID locally?</source>
-        <translation>Uložit označení uživatele místně?</translation>
+        <translation>Uložit ID uživatele lokálně?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
@@ -5632,24 +5648,24 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
         <source>HTTP proxy</source>
-        <translation>Proxy HTTP</translation>
+        <translation>HTTP proxy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
         <source>SOCKS proxy</source>
-        <translation>Proxy SOCKS</translation>
+        <translation>SOCKS proxy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
         <source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>E-mail a heslo ke cloudovému úložišti mohou obsahovat pouze písmena, čísla a &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, &apos;+&apos;.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
         <source>Subsurface cloud storage (credentials verified)</source>
-        <translation type="unfinished"/>
+        <translation>Cloudové úložiště Subsurface (přístupové údaje ověřeny)</translation>
     </message>
 </context>
 <context>
@@ -5662,7 +5678,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="20"/>
         <source>Unit system</source>
-        <translation type="unfinished"/>
+        <translation>Systém jednotek</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="26"/>
@@ -5672,22 +5688,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="33"/>
         <source>&amp;Metric</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Metrické</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="40"/>
         <source>Imperial</source>
-        <translation>Anglický palcový</translation>
+        <translation>Imperiální</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="47"/>
         <source>Personali&amp;ze</source>
-        <translation type="unfinished"/>
+        <translation>Personali&amp;zovat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="57"/>
         <source>Individual settings</source>
-        <translation type="unfinished"/>
+        <translation>Individuální nastavení</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="69"/>
@@ -5727,12 +5743,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="130"/>
         <source>&amp;liter</source>
-        <translation type="unfinished"/>
+        <translation>&amp;litr</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/>
         <source>cu ft</source>
-        <translation>cu stopa</translation>
+        <translation>cu ft</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/>
@@ -5742,12 +5758,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="157"/>
         <source>celsius</source>
-        <translation>celsius</translation>
+        <translation>Celsius</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="167"/>
         <source>fahrenheit</source>
-        <translation>stupně Fahrenheita</translation>
+        <translation>Fahrenheit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="177"/>
@@ -5762,7 +5778,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="194"/>
         <source>lbs</source>
-        <translation>libra US</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="207"/>
@@ -5792,17 +5808,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/>
         <source>Location Display</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazení pozice</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/>
         <source>traditional (dms)</source>
-        <translation type="unfinished"/>
+        <translation>tradiční (dms)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/>
         <source>decimal</source>
-        <translation type="unfinished"/>
+        <translation>desetinný</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
@@ -5838,22 +5854,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="41"/>
         <source>&amp;Dive list print</source>
-        <translation type="unfinished"/>
+        <translation>Tisk seznamu ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="57"/>
         <source>&amp;Statistics print</source>
-        <translation type="unfinished"/>
+        <translation>Tisk statistik</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="67"/>
         <source>Print options</source>
-        <translation>Volby pro tisk</translation>
+        <translation>Možnosti tisku</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="79"/>
         <source>Print only selected dives</source>
-        <translation>Vytisknout pouze vybraná potápění</translation>
+        <translation>Vytisknout pouze vybrané ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="92"/>
@@ -5863,12 +5879,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="102"/>
         <source>Template</source>
-        <translation type="unfinished"/>
+        <translation>Šablona</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="127"/>
         <source>Edit</source>
-        <translation type="unfinished"/>
+        <translation>Upravit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="134"/>
@@ -5878,38 +5894,38 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="141"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>Export</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.ui" line="148"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Import</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="128"/>
         <source>Import template file</source>
-        <translation type="unfinished"/>
+        <translation>Importovat soubor šablony</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="129"/>
         <location filename="../desktop-widgets/printoptions.cpp" line="142"/>
         <source>HTML files (*.html)</source>
-        <translation>Soubory HTML (*.html)</translation>
+        <translation>HTML soubory (*.html)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="141"/>
         <source>Export template files as</source>
-        <translation type="unfinished"/>
+        <translation>Exportovat soubory šablon jako</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="152"/>
         <source>This action cannot be undone!</source>
-        <translation type="unfinished"/>
+        <translation>Tuto akci nelze vrátit!</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/printoptions.cpp" line="153"/>
         <source>Delete template: %1?</source>
-        <translation type="unfinished"/>
+        <translation>Smazat šablonu: %1?</translation>
     </message>
 </context>
 <context>
@@ -5922,22 +5938,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
         <source>Unknown dive computer</source>
-        <translation>Neznámý potápěcí počítač</translation>
+        <translation>Neznámý potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="773"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
-        <translation>Nulový čas/Čas vynoření byl zakázán kvůli překročení času</translation>
+        <translation>NDL / TTS nebylo zobrazeno kvůli příliš dlouhému času zpracování</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1359"/>
         <source>Make first divecomputer</source>
-        <translation>Hlavní potápěcí počítač</translation>
+        <translation>První potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1361"/>
         <source>Delete this divecomputer</source>
-        <translation>Smazat tento potápěcí počítač</translation>
+        <translation>Smazat tento potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
@@ -5947,12 +5963,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1378"/>
         <source> (Tank %1)</source>
-        <translation> (nádrž %1)</translation>
+        <translation> (lahev %1)</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
         <source>Add set-point change</source>
-        <translation>Přidat změnu nastavení bodu</translation>
+        <translation>Přidat změnu setpointu</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
@@ -5962,7 +5978,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1392"/>
         <source>Edit the profile</source>
-        <translation type="unfinished"/>
+        <translation>Editovat profil</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1396"/>
@@ -5983,7 +5999,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
         <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
-        <translation>Upravit tlak v láhvi (nádrži)  %1 (v současnosti interpolován jako %2)</translation>
+        <translation>Upravit tlak v lahvi %1 (v současnosti interpolován jako %2)</translation>
     </message>
     <message>
         <location filename="../profile-widget/profilewidget2.cpp" line="1459"/>
@@ -6031,84 +6047,84 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
         <source>Starting...</source>
-        <translation type="unfinished"/>
+        <translation>Spouštění...</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/>
         <source>working in no-cloud mode</source>
-        <translation type="unfinished"/>
+        <translation>režim práce bez cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/>
         <source>no cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>žádné přístupové údaje ke cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/>
         <source>Please enter valid cloud credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Prosím zadejte platné přístupové údaje ke cloudu.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/>
         <source>Attempting to open cloud storage with new credentials</source>
-        <translation type="unfinished"/>
+        <translation>Pokus o otevření cloudového úložiště s novými přístupovými údaji</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/>
         <source>Testing cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Testování přístupových údajů ke cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/>
         <source>No response from cloud server to validate the credentials</source>
-        <translation type="unfinished"/>
+        <translation>Žádná odpověď cloudového serveru k ověření přístupových údajů</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
-        <translation type="unfinished"/>
+        <translation>Nelze se připojit ke cloudovému úložišti - cloudový účet neověřen</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
         <source>Cloud credentials are invalid</source>
-        <translation type="unfinished"/>
+        <translation>Neplatné přístupové údaje ke cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
-        <translation type="unfinished"/>
+        <translation>Nelze otevřít cloudové úložiště: Chyba vytvoření https spojení</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/>
         <source>Cannot open cloud storage: %1</source>
-        <translation type="unfinished"/>
+        <translation>Nelze otevřít cloudové úložiště: %1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/>
         <source>Cannot connect to cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Nelze se připojit ke cloudovému úložišti</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/>
         <source>Cloud storage error: %1</source>
-        <translation type="unfinished"/>
+        <translation>Chyba cloudového úložiště: %1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
-        <translation type="unfinished"/>
+        <translation>Selhalo připojení ke cloudovému serveru, návrat ke stavu bez cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
-        <translation type="unfinished"/>
+        <translation>Cloudové úložiště úspěšně otevřeno. Žádné ponory v seznamu.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
         <source>h</source>
-        <translation type="unfinished"/>
+        <translation>h</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
@@ -6120,12 +6136,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
         <source>sec</source>
-        <translation type="unfinished"/>
+        <translation>s</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Neznámá GPS pozice</translation>
     </message>
 </context>
 <context>
@@ -6133,7 +6149,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../core/gpslocation.h" line="13"/>
         <source>Waiting to aquire GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Čekání na získání GPS pozice</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="766"/>
@@ -6145,7 +6161,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <location filename="../core/qthelper.cpp" line="768"/>
         <location filename="../core/qthelper.cpp" line="1271"/>
         <source>ft</source>
-        <translation>st</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="794"/>
@@ -6167,7 +6183,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <location filename="../core/qthelper.cpp" line="823"/>
         <location filename="../core/qthelper.cpp" line="1248"/>
         <source>lbs</source>
-        <translation>libra US</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="848"/>
@@ -6190,12 +6206,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../core/qthelper.cpp" line="873"/>
         <source>EAN</source>
-        <translation type="unfinished"/>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
         <location filename="../core/qthelper.cpp" line="962"/>
         <source>(%n dive(s))</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>(%n ponor(y))</numerusform><numerusform>(%n ponor(y))</numerusform><numerusform>(%n ponor(y))</numerusform></translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="1232"/>
@@ -6210,12 +6226,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../core/qthelper.cpp" line="1320"/>
         <source>cuft</source>
-        <translation>cu stopa</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
         <source>unknown</source>
-        <translation>Neznámý</translation>
+        <translation>neznámo</translation>
     </message>
     <message>
         <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
@@ -6235,7 +6251,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/globe.cpp" line="327"/>
         <source>Move the map and double-click to set the dive location</source>
-        <translation>Posunout mapu a dvojitým klepnutím označit místo potápění</translation>
+        <translation>Dvojklikem označte potápěčskou lokalitu na mapě</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
@@ -6255,22 +6271,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
         <source>Invalid response from server</source>
-        <translation>Neplatná odpověď od serveru</translation>
+        <translation>Neplatná odpověď serveru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/>
         <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
-        <translation>Byla očekávána značka XML &apos;DiveDateReader&apos;, místo ní obdrženo &apos;%1</translation>
+        <translation>Byl očekáván XML tag &apos;DiveDateReader&apos;, místo toho nalezeno &apos;%1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="679"/>
         <source>Expected XML tag &apos;DiveDates&apos; not found</source>
-        <translation>Očekávaná značka XML &apos;DiveDates&apos; nenalezena</translation>
+        <translation>Očekávaný XML tag &apos;DiveDates&apos; nenalezen</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="686"/>
         <source>Malformed XML response. Line %1: %2</source>
-        <translation>Neplatná odpověď XML. Řádek %1: %2</translation>
+        <translation>Špatný formát XML odpovědi. Řádek %1: %2</translation>
     </message>
 </context>
 <context>
@@ -6279,7 +6295,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/>
         <source>This feature is not yet available for the selected dive computer.</source>
-        <translation>Tato funkce ještě není pro vybraný potápěcí počítač dostupná.</translation>
+        <translation>Tato funkce ještě není dostupná pro vybraný potápěčský počítač.</translation>
     </message>
 </context>
 <context>
@@ -6292,13 +6308,13 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="43"/>
         <source>Renumbering all dives</source>
-        <translation type="unfinished"/>
+        <translation>Přečíslování všech ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/renumber.ui" line="61"/>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="142"/>
         <source>New starting number</source>
-        <translation>Nové první číslo</translation>
+        <translation>Nové počáteční číslo</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="140"/>
@@ -6308,12 +6324,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="145"/>
         <source>Renumber selected dives</source>
-        <translation type="unfinished"/>
+        <translation>Přečíslovat označené ponory</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="147"/>
         <source>Renumber all dives</source>
-        <translation type="unfinished"/>
+        <translation>Přečíslovat všechny ponory</translation>
     </message>
 </context>
 <context>
@@ -6321,7 +6337,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/>
         <source>Reset settings failed!</source>
-        <translation type="unfinished"/>
+        <translation>Resetování nastavení selhalo!</translation>
     </message>
 </context>
 <context>
@@ -6342,7 +6358,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="43"/>
         <source>New set-point (0 for OC)</source>
-        <translation>Nový bod nastavení  (0 pro otevřený sytém)</translation>
+        <translation>Nový setpoint  (0 pro otevřený sytém)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/setpoint.ui" line="61"/>
@@ -6382,32 +6398,34 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <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"/>
+        <translation>Varování!
+Ne všechny obrázky mají čas mezi
+30 minutami před začátkem a 30 minutami po konci vybraného ponoru.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="137"/>
         <source>Load images even if the time does not match the dive time</source>
-        <translation type="unfinished"/>
+        <translation>Nahrát obrázky i pokud jejich čas nesouhlasí s časem ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="180"/>
         <source>To compute the offset between the clocks of your dive computer and your camera use your camera to take a picture of your dive compuer displaying the current time. Download that image to your computer and press this button.</source>
-        <translation type="unfinished"/>
+        <translation>Pro vypočtení rozdílu mezi časem vašeho potápěčského počítače a vaším fotoaparátem vyfoťte vaším fotoaparátem váš potápěčský počítač zobrazující aktuální čas. Stáhněte fotografii do počítače a stiskněte toto tlačítko.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="190"/>
         <source>Determine camera time offset</source>
-        <translation>Určit posun času kamery</translation>
+        <translation>Určit posun času fotoaparátu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="193"/>
         <source>Select image of divecomputer showing time</source>
-        <translation>Vybrat obrázek potápecího počítače, který ukazuje hodiny potápecího počítače</translation>
+        <translation>Vyberte fotografii zobrazující čas na potápěčském počítači</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shiftimagetimes.ui" line="215"/>
         <source>Which date and time are displayed on the image?</source>
-        <translation>Jaké datum a čas jsou zobrazeny na obrázku?</translation>
+        <translation>Jaké datum a čas jsou zobrazeny na fotografii?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="302"/>
@@ -6425,12 +6443,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="23"/>
         <source>Shift selected dive times</source>
-        <translation>Posunout vybrané časy potápění</translation>
+        <translation>Posunout časy vybraných ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="49"/>
         <source>Shift times of selected dives by</source>
-        <translation>Posunout časy vybraných potápění o</translation>
+        <translation>Posunout časy vybraných ponorů o</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/shifttimes.ui" line="72"/>
@@ -6469,63 +6487,63 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="20"/>
         <source>SmartTrak files importer</source>
-        <translation type="unfinished"/>
+        <translation>Importér souborů SmartTrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Deník ponorů Subsurface&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="177"/>
         <source>Choose</source>
-        <translation type="unfinished"/>
+        <translation>Vybrat</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Deník ponorů Smartrak&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Konec</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="270"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Import</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="295"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Select the .slg file(s) you want to import to Subsurface format, and the exported .xml file. It&apos;s advisable to use a new output file, as its actual content will be erased.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600; color:#6ebeb9;&quot;&gt;Vyberte .slg soubor(y), které chcete importovat do Subsurface formátu, a exportovaný .xml soubor. Je doporučeno použít nový výstupní soubor, protože jeho aktuální obsah bude smazán.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/>
         <source>Import messages (Errors, warnings, etc)</source>
-        <translation type="unfinished"/>
+        <translation>Importovat zprávy (chyby, varování, atd.)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="50"/>
         <source>Open SmartTrak files</source>
-        <translation type="unfinished"/>
+        <translation>Otevřit soubory SmartTrak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/>
         <source>SmartTrak files (*.slg *.SLG);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>SmartTrak soubory (*.slg *.SLG);;Všechny soubory (*)</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/>
         <source>Open Subsurface files</source>
-        <translation type="unfinished"/>
+        <translation>Otevřít soubory Subsurface</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/>
         <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface soubory (*.ssrf *SSRF *.xml *.XML);;Všechny soubory (*)</translation>
     </message>
 </context>
 <context>
@@ -6534,7 +6552,7 @@ Not all images have timestamps in the range between
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/>
         <source>Dive date: %1 
 </source>
-        <translation>Datum potápění: %1 
+        <translation>Datum ponoru: %1 
 </translation>
     </message>
     <message>
@@ -6560,21 +6578,21 @@ Not all images have timestamps in the range between
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/>
         <source>Dive location: %1 
 </source>
-        <translation>Místo potápění: %1 min
+        <translation>Potápěčská lokalitaí: %1
 </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/>
         <source>Buddy: %1 
 </source>
-        <translation>Společník při potápění: %1
+        <translation>Buddy: %1
 </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/>
         <source>Divemaster: %1 
 </source>
-        <translation>Vedoucí skupiny potápečů: %1
+        <translation>Divemaster: %1
 </translation>
     </message>
     <message>
@@ -6595,7 +6613,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/>
         <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source>
-        <translation type="unfinished"/>
+        <translation>Text vpravo bude odeslán jako popisek s obrázkem vašeho profilu ponoru na Facebook. Název alba je vyžadováno (obrázek profilu bude poslán do tohoto alba).</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="70"/>
@@ -6630,12 +6648,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="112"/>
         <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="119"/>
         <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/>
@@ -6645,7 +6663,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="139"/>
         <source>Facebook post preview</source>
-        <translation type="unfinished"/>
+        <translation>Náhled příspěvku na Facebook</translation>
     </message>
 </context>
 <context>
@@ -6654,19 +6672,22 @@ Not all images have timestamps in the range between
         <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
         <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
 </source>
-        <translation type="unfinished"/>
+        <translation>Prosím zadejte vaše přihlašovací údaje pro cloudové úložiště Subsurface, abyste jej mohli využívat se Subsurface-mobile.
+</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
         <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
 
 </source>
-        <translation type="unfinished"/>
+        <translation>Pokud je toto poprvé, kdy využíváte cloudové úložiště Subsurface, zadejte platný e-mail (malými písmeny) a heslo dle vašeho výběru (písmena a čísla). Na e-mailovou adresu bude odeslán PIN, který sem budete muset zadat.
+
+</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
         <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
-        <translation type="unfinished"/>
+        <translation>Pro použití Subsurface-mobile pouze s lokálními daty na tomto zařízení, klikněte dole na ikonu žádný cloud.</translation>
     </message>
 </context>
 <context>
@@ -6679,12 +6700,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/about.ui" line="80"/>
         <source>&amp;License</source>
-        <translation>&amp;Povolení</translation>
+        <translation>&amp;Licence</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="87"/>
         <source>&amp;Website</source>
-        <translation>&amp;Stránky</translation>
+        <translation>&amp;Web</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/about.ui" line="94"/>
@@ -6694,7 +6715,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2017&lt;/span&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multiplatformní potápěčský deník&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, Tomaz Canabrava a další, 2011-2017&lt;/span&gt;</translation>
     </message>
 </context>
 <context>
@@ -6702,12 +6723,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
         <source>Enter User ID and click Download</source>
-        <translation>Zadejte označení uživatele a klepněte na Stáhnout</translation>
+        <translation>Zadejte ID uživatele a klikněte na Stáhnout</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
         <source>Webservice</source>
-        <translation>Internetová služba</translation>
+        <translation>Webová služba</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="505"/>
@@ -6742,7 +6763,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
         <source>Download successful</source>
-        <translation>Stažení se zdařilo</translation>
+        <translation>Stahování se zdařilo</translation>
     </message>
 </context>
 <context>
@@ -6775,7 +6796,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/>
         <source>Tags: </source>
-        <translation>Značky:</translation>
+        <translation>Tagy:</translation>
     </message>
 </context>
 <context>
@@ -6783,7 +6804,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/filtermodels.cpp" line="153"/>
         <source>Empty tags</source>
-        <translation>Prázdné značky</translation>
+        <translation>Prázdné tagy</translation>
     </message>
 </context>
 <context>
@@ -6809,17 +6830,17 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="14"/>
         <source>Edit template</source>
-        <translation type="unfinished"/>
+        <translation>Upravit šablonu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="37"/>
         <source>Preview</source>
-        <translation type="unfinished"/>
+        <translation>Náhled</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="94"/>
         <source>Style</source>
-        <translation type="unfinished"/>
+        <translation>Styl</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="104"/>
@@ -6829,27 +6850,27 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="112"/>
         <source>Arial</source>
-        <translation type="unfinished"/>
+        <translation>Arial</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="117"/>
         <source>Impact</source>
-        <translation type="unfinished"/>
+        <translation>Impact</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="122"/>
         <source>Georgia</source>
-        <translation type="unfinished"/>
+        <translation>Georgia</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="127"/>
         <source>Courier</source>
-        <translation type="unfinished"/>
+        <translation>Courier</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="132"/>
         <source>Verdana</source>
-        <translation type="unfinished"/>
+        <translation>Verdana</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="144"/>
@@ -6859,52 +6880,52 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="165"/>
         <source>Color palette</source>
-        <translation type="unfinished"/>
+        <translation>Barevná paleta</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="173"/>
         <source>Default</source>
-        <translation type="unfinished"/>
+        <translation>Výchozí</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="178"/>
         <source>Almond</source>
-        <translation type="unfinished"/>
+        <translation>Almond</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="183"/>
         <source>Shades of blue</source>
-        <translation type="unfinished"/>
+        <translation>Odstíny modré</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="188"/>
         <source>Custom</source>
-        <translation type="unfinished"/>
+        <translation>Osobní</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="200"/>
         <source>Line spacing</source>
-        <translation type="unfinished"/>
+        <translation>Řádkování</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="241"/>
         <source>Template</source>
-        <translation type="unfinished"/>
+        <translation>Šablona</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="264"/>
         <source>Colors</source>
-        <translation type="unfinished"/>
+        <translation>Barvy</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="280"/>
         <source>Background</source>
-        <translation type="unfinished"/>
+        <translation>Pozadí</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="293"/>
         <source>color1</source>
-        <translation type="unfinished"/>
+        <translation>barva1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="303"/>
@@ -6914,62 +6935,62 @@ Not all images have timestamps in the range between
         <location filename="../desktop-widgets/templateedit.ui" line="463"/>
         <location filename="../desktop-widgets/templateedit.ui" line="503"/>
         <source>Edit</source>
-        <translation type="unfinished"/>
+        <translation>Upravit</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="320"/>
         <source>Table cells 1</source>
-        <translation type="unfinished"/>
+        <translation>Buňky tabulky 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="333"/>
         <source>color2</source>
-        <translation type="unfinished"/>
+        <translation>barva2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="360"/>
         <source>Table cells 2</source>
-        <translation type="unfinished"/>
+        <translation>Buňky tabulky 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="373"/>
         <source>color3</source>
-        <translation type="unfinished"/>
+        <translation>barva3</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="400"/>
         <source>Text 1</source>
-        <translation type="unfinished"/>
+        <translation>Text 1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="413"/>
         <source>color4</source>
-        <translation type="unfinished"/>
+        <translation>barva4</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="440"/>
         <source>Text 2</source>
-        <translation type="unfinished"/>
+        <translation>Text 2</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="453"/>
         <source>color5</source>
-        <translation type="unfinished"/>
+        <translation>barva5</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="480"/>
         <source>Borders</source>
-        <translation type="unfinished"/>
+        <translation>Okraje</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.ui" line="493"/>
         <source>color6</source>
-        <translation type="unfinished"/>
+        <translation>barva6</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/templateedit.cpp" line="133"/>
         <source>Do you want to save your changes?</source>
-        <translation type="unfinished"/>
+        <translation>Chcete uložit vaše změny?</translation>
     </message>
 </context>
 <context>
@@ -7040,7 +7061,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="821"/>
         <source>%1click to visit %2</source>
-        <translation type="unfinished"/>
+        <translation>%1klik k návštěvě %2</translation>
     </message>
 </context>
 <context>
@@ -7056,7 +7077,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="68"/>
         <source>(%1 shown)</source>
-        <translation type="unfinished"/>
+        <translation>(%1 zobrazeno)</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="211"/>
@@ -7086,7 +7107,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="220"/>
         <source>ft</source>
-        <translation>st</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="223"/>
@@ -7101,7 +7122,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="229"/>
         <source>Weight(%1)</source>
-        <translation>Váha (%1)</translation>
+        <translation>Hmotnost (%1)</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="229"/>
@@ -7111,7 +7132,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="229"/>
         <source>lbs</source>
-        <translation>libra US</translation>
+        <translation>lbs</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="232"/>
@@ -7121,17 +7142,17 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="235"/>
         <source>Cyl</source>
-        <translation>Láhev</translation>
+        <translation>Lahev</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="238"/>
         <source>Gas</source>
-        <translation>Směs</translation>
+        <translation>Plyn</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="243"/>
         <source>SAC(%1)</source>
-        <translation>Spotřeba plynu (%1)</translation>
+        <translation>SAC (%1)</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="243"/>
@@ -7146,12 +7167,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="249"/>
         <source>Max CNS</source>
-        <translation>Max. CNS</translation>
+        <translation>Max CNS</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="252"/>
         <source>Photos before/during/after dive</source>
-        <translation type="unfinished"/>
+        <translation>Fotografie před/během/po ponoru</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="255"/>
@@ -7169,7 +7190,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/urldialog.ui" line="52"/>
         <source>Enter URL for images</source>
-        <translation type="unfinished"/>
+        <translation>Zadejte URL obrázků</translation>
     </message>
 </context>
 <context>
@@ -7202,7 +7223,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
         <source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
-        <translation>Je dostupná nová verze Subsurface.&lt;br/&gt;Klepněte na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; pro její stažení.</translation>
+        <translation>Je dostupná nová verze Subsurface.&lt;br/&gt;Klikněte na:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; pro její stažení.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
@@ -7212,7 +7233,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
         <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
-        <translation>Nejnovější verze je %1. Podívejte se, prosím, na %2 naši stahovací stránku %3 kvůli informaci o tom, jak aktualizovat.</translation>
+        <translation>Nejnovější verze je %1. Podívejte se prosím na %2 naši stránku %3 pro informace o aktualizaci.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
@@ -7228,7 +7249,8 @@ Not all images have timestamps in the range between
         <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
         <source>Subsurface is checking every two weeks if a new version is available. 
  If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface kontroluje každé dva týdny, zda není k dispozici nová verze.
+Pokud nechcete, aby Subsurface pokračoval v kontrole, klikněte na Odmítnout.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
@@ -7265,17 +7287,17 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="14"/>
         <source>User survey</source>
-        <translation type="unfinished"/>
+        <translation>Uživatelský průzkum</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="31"/>
         <source>Subsurface user survey</source>
-        <translation type="unfinished"/>
+        <translation>Uživatelský průzkum Subsurface</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Rádi bychom zjistili víc, o našich uživatelích, jejich preferencích a návicích. Prosíme věnujte chvíli vyplnění tohoto formuláře a odeslání týmu Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="63"/>
@@ -7290,12 +7312,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="89"/>
         <source>Dive planner</source>
-        <translation>Plánovač potápění</translation>
+        <translation>Plánovač ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="102"/>
         <source>Supported dive computer</source>
-        <translation>Podporovaný potápěcí počítač</translation>
+        <translation>Podporovaný potápěčský počítač</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
@@ -7305,17 +7327,17 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
         <source>Manually entering dives</source>
-        <translation>Ruční zadávání potápění</translation>
+        <translation>Ruční zadávání ponorů</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="141"/>
         <source>Android/iPhone companion app</source>
-        <translation>Program průvodce Android/iPhone</translation>
+        <translation>Android/iPhone companion aplikace</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="154"/>
         <source>Any suggestions? (in English)</source>
-        <translation>Návrhy? (v angličtině)</translation>
+        <translation>Návrhy? (Anglicky)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="177"/>
@@ -7330,12 +7352,12 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/usersurvey.ui" line="270"/>
         <source>Where are you importing data from?</source>
-        <translation>Odkud zavádíte data?</translation>
+        <translation>Odkud importujete data?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
         <source>Send</source>
-        <translation>Poslat</translation>
+        <translation>Odeslat</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
@@ -7444,7 +7466,7 @@ Jazyk: %1</translation>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="32"/>
         <source>Enter your ID here</source>
-        <translation>Zadejte identifikátor zde</translation>
+        <translation>Sem zadejte vaše ID</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="44"/>
@@ -7454,12 +7476,12 @@ Jazyk: %1</translation>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="68"/>
         <source>User ID</source>
-        <translation>Označení uživatele</translation>
+        <translation>ID Uživatele</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="85"/>
         <source>Save user ID locally?</source>
-        <translation>Uložit označení uživatele místně?</translation>
+        <translation>Uložit lokálně ID uživatele?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/webservices.ui" line="92"/>
@@ -7492,12 +7514,12 @@ Jazyk: %1</translation>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="13"/>
         <source>Weight</source>
-        <translation>Váha</translation>
+        <translation>Hmotnost</translation>
     </message>
     <message>
         <location filename="../qt-models/weightmodel.cpp" line="77"/>
         <source>Clicking here will remove this weight system.</source>
-        <translation>Klepnutím zde se odstraní systém vah.</translation>
+        <translation>Kliknutí sem odstraní zátěž.</translation>
     </message>
 </context>
 <context>
@@ -7506,7 +7528,7 @@ Jazyk: %1</translation>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="524"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="555"/>
         <source>No error</source>
-        <translation type="unfinished"/>
+        <translation>Žádná chyba</translation>
     </message>
 </context>
 <context>
@@ -7515,14 +7537,14 @@ Jazyk: %1</translation>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/>
         <source>This feature is not yet available for the selected dive computer.</source>
-        <translation>Tato funkce ještě není pro vybraný potápěcí počítač dostupná.</translation>
+        <translation>Tato funkce ještě není pro vybraný potápěčský počítač dostupná.</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/>
         <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/>
         <source>Failed!</source>
-        <translation>Nepodařilo se!</translation>
+        <translation>Selhalo!</translation>
     </message>
 </context>
 <context>
@@ -7532,7 +7554,7 @@ Jazyk: %1</translation>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
- &gt; Měsíc/Cesta</translation>
+ &gt; Měsíc / Výlet</translation>
     </message>
     <message>
         <location filename="../qt-models/yearlystatisticsmodel.cpp" line="129"/>
@@ -7612,37 +7634,37 @@ Průměr</translation>
     <message>
         <location filename="../core/taxonomy.c" line="6"/>
         <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Žádné</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="7"/>
         <source>Ocean</source>
-        <translation type="unfinished"/>
+        <translation>Oceán</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="8"/>
         <source>Country</source>
-        <translation type="unfinished"/>
+        <translation>Stát</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="9"/>
         <source>State</source>
-        <translation type="unfinished"/>
+        <translation>Země</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="10"/>
         <source>County</source>
-        <translation type="unfinished"/>
+        <translation>Okres</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="11"/>
         <source>Town</source>
-        <translation type="unfinished"/>
+        <translation>Město</translation>
     </message>
     <message>
         <location filename="../core/taxonomy.c" line="12"/>
         <source>City</source>
-        <translation type="unfinished"/>
+        <translation>Město</translation>
     </message>
 </context>
 <context>
@@ -7650,7 +7672,7 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="776"/>
         <source>Error parsing the header</source>
-        <translation type="unfinished"/>
+        <translation>Chyba parsování hlavičky</translation>
     </message>
 </context>
 <context>
@@ -7729,72 +7751,72 @@ Průměr</translation>
     <message>
         <location filename="../core/datatrak.c" line="153"/>
         <source>Error: the file does not appear to be a DATATRAK divelog</source>
-        <translation type="unfinished"/>
+        <translation>Chyba: soubor se nezdá být DATATREK divelogem</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="286"/>
         <source>clear</source>
-        <translation type="unfinished"/>
+        <translation>jasno</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="289"/>
         <source>misty</source>
-        <translation type="unfinished"/>
+        <translation>mlhavo</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="292"/>
         <source>fog</source>
-        <translation type="unfinished"/>
+        <translation>mlha</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="295"/>
         <source>rain</source>
-        <translation type="unfinished"/>
+        <translation>déšť</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="298"/>
         <source>storm</source>
-        <translation type="unfinished"/>
+        <translation>bouře</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="301"/>
         <source>snow</source>
-        <translation type="unfinished"/>
+        <translation>sníh</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="321"/>
         <source>No suit</source>
-        <translation type="unfinished"/>
+        <translation>Žádný oblek</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="324"/>
         <source>Shorty</source>
-        <translation type="unfinished"/>
+        <translation>Short</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="327"/>
         <source>Combi</source>
-        <translation type="unfinished"/>
+        <translation>Kombinovaný</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="330"/>
         <source>Wet suit</source>
-        <translation type="unfinished"/>
+        <translation>Mokrý oblek</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="333"/>
         <source>Semidry suit</source>
-        <translation type="unfinished"/>
+        <translation>Polosuchý oblek</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="336"/>
         <source>Dry suit</source>
-        <translation type="unfinished"/>
+        <translation>Suchý oblek</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="396"/>
         <source>no stop</source>
-        <translation type="unfinished"/>
+        <translation>bezzastávkový</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="398"/>
@@ -7805,33 +7827,33 @@ Průměr</translation>
     <message>
         <location filename="../core/datatrak.c" line="400"/>
         <source>single ascent</source>
-        <translation type="unfinished"/>
+        <translation>jediný výstup</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="402"/>
         <source>multiple ascent</source>
-        <translation type="unfinished"/>
+        <translation>výcenásobný výstup</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="404"/>
         <location filename="../core/dive.c" line="27"/>
         <source>fresh</source>
-        <translation>čerstvý</translation>
+        <translation>sladká</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="406"/>
         <source>salt water</source>
-        <translation type="unfinished"/>
+        <translation>slaná voda</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="431"/>
         <source>sight seeing</source>
-        <translation type="unfinished"/>
+        <translation>prohlídka</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="433"/>
         <source>club dive</source>
-        <translation type="unfinished"/>
+        <translation>klubový ponor</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="435"/>
@@ -7842,7 +7864,7 @@ Průměr</translation>
     <message>
         <location filename="../core/datatrak.c" line="437"/>
         <source>instruction</source>
-        <translation type="unfinished"/>
+        <translation>instrukce</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="439"/>
@@ -7854,24 +7876,24 @@ Průměr</translation>
         <location filename="../core/datatrak.c" line="441"/>
         <location filename="../core/dive.c" line="25"/>
         <source>cave</source>
-        <translation>jeskyně</translation>
+        <translation>jeskynní</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="443"/>
         <location filename="../core/dive.c" line="24"/>
         <source>ice</source>
-        <translation>led</translation>
+        <translation>pod led</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="445"/>
         <source>search</source>
-        <translation type="unfinished"/>
+        <translation>vyhledávací</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="455"/>
         <location filename="../core/dive.c" line="25"/>
         <source>wreck</source>
-        <translation>vrak</translation>
+        <translation>vrakový</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="457"/>
@@ -7894,37 +7916,37 @@ Průměr</translation>
     <message>
         <location filename="../core/datatrak.c" line="463"/>
         <source>other</source>
-        <translation type="unfinished"/>
+        <translation>jiné</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="474"/>
         <source>Other activities</source>
-        <translation type="unfinished"/>
+        <translation>Ostatní aktivity</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="498"/>
         <source>Datatrak/Wlog notes</source>
-        <translation type="unfinished"/>
+        <translation>Datatrak/Wlog poznámky</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="537"/>
         <source>Manually entered dive</source>
-        <translation type="unfinished"/>
+        <translation>Ručně zadaný ponor</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="588"/>
         <source>Unknown</source>
-        <translation type="unfinished"/>
+        <translation>Neznámé</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="674"/>
         <source>Error: couldn&apos;t open the file %s</source>
-        <translation type="unfinished"/>
+        <translation>Chyba: nelze otevřít soubor %s</translation>
     </message>
     <message>
         <location filename="../core/datatrak.c" line="687"/>
         <source>Error: no dive</source>
-        <translation type="unfinished"/>
+        <translation>Chyba: žádný ponor</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="23"/>
@@ -7934,7 +7956,7 @@ Průměr</translation>
     <message>
         <location filename="../core/dive.c" line="23"/>
         <source>shore</source>
-        <translation>z břehu</translation>
+        <translation>ze břehu</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="24"/>
@@ -7944,7 +7966,7 @@ Průměr</translation>
     <message>
         <location filename="../core/dive.c" line="24"/>
         <source>cavern</source>
-        <translation>dutina</translation>
+        <translation>kavernový</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="25"/>
@@ -7979,7 +8001,7 @@ Průměr</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <source>diluent</source>
-        <translation type="unfinished"/>
+        <translation>ředidlo</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="33"/>
@@ -7992,7 +8014,7 @@ Průměr</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <source>not used</source>
-        <translation type="unfinished"/>
+        <translation>nepoužito</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="181"/>
@@ -8019,7 +8041,7 @@ Průměr</translation>
     <message>
         <location filename="../core/dive.c" line="232"/>
         <source>cuft</source>
-        <translation>cu stopa</translation>
+        <translation>cuft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="269"/>
@@ -8033,7 +8055,7 @@ Průměr</translation>
         <location filename="../core/qthelper.cpp" line="598"/>
         <location filename="../core/qthelper.cpp" line="612"/>
         <source>ft</source>
-        <translation>st</translation>
+        <translation>ft</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="297"/>
@@ -8053,7 +8075,7 @@ Průměr</translation>
     <message>
         <location filename="../core/dive.c" line="306"/>
         <source>ft/s</source>
-        <translation>st/s</translation>
+        <translation>stop/s</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="325"/>
@@ -8085,7 +8107,7 @@ Průměr</translation>
     <message>
         <location filename="../core/equipment.c" line="86"/>
         <source>EAN%d</source>
-        <translation>EAN %d</translation>
+        <translation>EAN%d</translation>
     </message>
     <message>
         <location filename="../core/equipment.c" line="198"/>
@@ -8095,7 +8117,7 @@ Průměr</translation>
     <message>
         <location filename="../core/equipment.c" line="199"/>
         <source>belt</source>
-        <translation>pásek</translation>
+        <translation>opasek</translation>
     </message>
     <message>
         <location filename="../core/equipment.c" line="200"/>
@@ -8105,17 +8127,17 @@ Průměr</translation>
     <message>
         <location filename="../core/equipment.c" line="201"/>
         <source>backplate weight</source>
-        <translation>Váha zadního plátu</translation>
+        <translation>backplate zátěž</translation>
     </message>
     <message>
         <location filename="../core/equipment.c" line="202"/>
         <source>clip-on</source>
-        <translation>připínací (se svorkou/sponou)</translation>
+        <translation>připínací</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="111"/>
         <source>No dives in the input file &apos;%s&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Žádné ponory ve vstupním souboru &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="121"/>
@@ -8131,32 +8153,32 @@ Průměr</translation>
         <location filename="../core/file.c" line="398"/>
         <source>Cannot open CSV file %s; please use Import log file dialog</source>
         <comment>'Import log file' should be the same text as corresponding label in Import menu</comment>
-        <translation>Nelze otevřít soubor CSV %s; Použijte, prosím, dialog pro zavedení souboru se záznamem</translation>
+        <translation>Nelze otevřít CSV soubor %s; Použijte dialog pro import souboru</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="514"/>
         <source>Empty file &apos;%s&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Prázdný soubor &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="694"/>
         <source>Poseidon import failed: unable to read &apos;%s&apos;</source>
-        <translation>Nepodařilo se zavést Poseidon: Nelze přečíst &apos;%s&apos;</translation>
+        <translation>Poseidon import selhal: nelze číst &apos;%s&apos;</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="730"/>
         <source>Mouth piece position OC</source>
-        <translation>Poloha náustku otevřený systém</translation>
+        <translation>Poloha náustku OC</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="734"/>
         <source>Mouth piece position CC</source>
-        <translation>Poloha náustku zavřený systém</translation>
+        <translation>Poloha náustku CC</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="738"/>
         <source>Mouth piece position unknown</source>
-        <translation>Poloha náustku neznámé</translation>
+        <translation>Poloha náustku neznámá</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="742"/>
@@ -8171,81 +8193,81 @@ Průměr</translation>
     <message>
         <location filename="../core/file.c" line="809"/>
         <source>O₂ calibration failed</source>
-        <translation>Kalibrace O₂ se nezdařila</translation>
+        <translation>Kalibrace O₂ selhala</translation>
     </message>
     <message>
         <location filename="../core/file.c" line="811"/>
         <location filename="../core/file.c" line="820"/>
         <source>O₂ calibration</source>
-        <translation>Přesné změření (kalibrace) O₂</translation>
+        <translation>Kalibrace O₂</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="134"/>
         <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Lokální adresář cache %s je poškozen - nelze synchronizovat s cloudovým úložištěm Subsurface</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="157"/>
         <location filename="../core/git-access.c" line="177"/>
         <source>Could not update local cache to newer remote data</source>
-        <translation type="unfinished"/>
+        <translation>Nelze aktualizovat lokální cache novějšími vzdálenými daty</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="170"/>
         <source>Subsurface cloud storage corrupted</source>
-        <translation type="unfinished"/>
+        <translation>Cloudové úložiště Subsurface poškozeno</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="284"/>
         <source>Could not update Subsurface cloud storage, try again later</source>
-        <translation type="unfinished"/>
+        <translation>Nelze aktualizovat cloudové úložiště Subsurface, zkuste to později</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="344"/>
         <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
-        <translation type="unfinished"/>
+        <translation>Vzdálené úložiště a lokální data se rozcházejí. Chyba: sloučení selhalo (%s)</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="374"/>
         <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
-        <translation type="unfinished"/>
+        <translation>Vzdálené úložiště a lokální data se rozcházejí. Nelze zkombinovat lokální a vzdálené změny</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="408"/>
         <source>Remote storage and local data diverged</source>
-        <translation type="unfinished"/>
+        <translation>Vzdálené úložiště a lokální data se rozcházejí</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="411"/>
         <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
-        <translation type="unfinished"/>
+        <translation>Vzdálené úložiště a lokální data se rozcházejí. Chyba: zápis dat selhal (%s)</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="420"/>
         <source>Problems with local cache of Subsurface cloud data</source>
-        <translation type="unfinished"/>
+        <translation>Problém s lokální cache cloudového úložiště Subsurface</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="421"/>
         <source>Moved cache data to %s. Please try the operation again.</source>
-        <translation type="unfinished"/>
+        <translation>Cache data přesunuta do %s. Prosím zkuste operaci znovu.</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="743"/>
         <source>Error connecting to Subsurface cloud storage</source>
-        <translation type="unfinished"/>
+        <translation>Chyba připojení ke cloudovému úložišti Subsurface</translation>
     </message>
     <message>
         <location filename="../core/git-access.c" line="746"/>
         <source>git clone of %s failed (%s)</source>
-        <translation type="unfinished"/>
+        <translation>git clone %s selhal (%s)</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="218"/>
         <location filename="../core/parse-xml.c" line="3317"/>
         <location filename="../core/uemis-downloader.c" line="134"/>
         <source>unknown</source>
-        <translation>Neznámý</translation>
+        <translation>neznámý</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="231"/>
@@ -8270,7 +8292,7 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="240"/>
         <source>surface</source>
-        <translation>povrch</translation>
+        <translation>hladina</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="241"/>
@@ -8290,7 +8312,7 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deepstop</source>
-        <translation>hloubková zastávka</translation>
+        <translation>deepstop</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="246"/>
@@ -8306,7 +8328,7 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="248"/>
         <source>divetime</source>
-        <translation>čas potápění</translation>
+        <translation>trvání ponoru</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="252"/>
@@ -8326,7 +8348,7 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="255"/>
         <source>tissue level warning</source>
-        <translation>upozornění na nasycení tkaniv</translation>
+        <translation>varování nasycení tkání</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="265"/>
@@ -8336,57 +8358,57 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="592"/>
         <source>Error parsing the datetime</source>
-        <translation>Chyba při zpracování času</translation>
+        <translation>Chyba při zpracování datumu a času</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="610"/>
         <source>Dive %d: %s</source>
-        <translation>Potápění #%d: %s</translation>
+        <translation>Ponor číslo %d: %s</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="616"/>
         <source>Error parsing the divetime</source>
-        <translation>Chyba při zpracování času potápění</translation>
+        <translation>Chyba zpracování datumu a času ponoru</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the maxdepth</source>
-        <translation>Chyba při zpracování největší hloubky</translation>
+        <translation>Chyba zpracování největší hloubky</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="645"/>
         <source>Error parsing temperature</source>
-        <translation>Chyba při zpracování teploty</translation>
+        <translation>Chyba zpracování teploty</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="665"/>
         <source>Error parsing the gas mix count</source>
-        <translation>Chyba při zpracování dýchacích směsí</translation>
+        <translation>Chyba zpracování počtu dýchacích plynů</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="677"/>
         <source>Error obtaining water salinity</source>
-        <translation>Chyba při získávání slanosti vody</translation>
+        <translation>Chyba zpracování salinity vody</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="686"/>
         <source>Error obtaining surface pressure</source>
-        <translation>Chyba při získávání tlaku na povrchu</translation>
+        <translation>Chyba zpracování tlaku na hladině</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="711"/>
         <source>Error obtaining divemode</source>
-        <translation>Chyba při získávání režimu potápění</translation>
+        <translation>Chyba zpracování režimu ponoru</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="731"/>
         <source>Error parsing the gas mix</source>
-        <translation>Chyba při zpracování směsi plynu</translation>
+        <translation>Chyba zpracování směsi plynu</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="756"/>
         <source>Unable to create parser for %s %s</source>
-        <translation>Nelze zpracovat %s %s</translation>
+        <translation>Nelze vytvořit parser pro %s %s</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="762"/>
@@ -8396,12 +8418,12 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="783"/>
         <source>Error parsing the samples</source>
-        <translation>Chyba při zpracování vzorků</translation>
+        <translation>Chyba zpracování vzorků</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="921"/>
         <source>Event: waiting for user action</source>
-        <translation>Událost: Čekání na vstup uživatele</translation>
+        <translation>Událost: Čekání na uživatelský vstup</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="929"/>
@@ -8411,17 +8433,17 @@ Průměr</translation>
     <message>
         <location filename="../core/libdivecomputer.c" line="993"/>
         <source>Error registering the event handler.</source>
-        <translation type="unfinished"/>
+        <translation>Chyba registrování ovladače události.</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="998"/>
         <source>Error registering the cancellation handler.</source>
-        <translation type="unfinished"/>
+        <translation>Chyba registrování ovladače zrušení.</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Dive data import error</source>
-        <translation>Chyba při zavádění dat o potápění</translation>
+        <translation>Chyba zavádění dat ponoru</translation>
     </message>
     <message>
         <location filename="../core/libdivecomputer.c" line="1058"/>
@@ -8443,31 +8465,34 @@ Průměr</translation>
         <location filename="../core/parse-xml.c" line="1242"/>
         <source>multiple GPS locations for this dive site; also %s
 </source>
-        <translation type="unfinished"/>
+        <translation>více GPS pozic pro tuto potápěčskou lokalitu; také %s
+</translation>
     </message>
     <message>
         <location filename="../core/load-git.c" line="222"/>
         <location filename="../core/parse-xml.c" line="1304"/>
         <source>additional name for site: %s
 </source>
-        <translation type="unfinished"/>
+        <translation>dodatečný název lokality: %s
+</translation>
     </message>
     <message>
         <location filename="../core/ostctools.c" line="92"/>
         <location filename="../core/ostctools.c" line="124"/>
         <source>Unknown DC in dive %d</source>
-        <translation type="unfinished"/>
+        <translation>Neznámý potápěčský počítač v ponoru %d</translation>
     </message>
     <message>
         <location filename="../core/ostctools.c" line="137"/>
         <source>Error - %s - parsing dive %d</source>
-        <translation type="unfinished"/>
+        <translation>Chyba - %s - parsování ponoru %d</translation>
     </message>
     <message>
         <location filename="../core/parse-xml.c" line="517"/>
         <source>Strange percentage reading %s
 </source>
-        <translation type="unfinished"/>
+        <translation>Načtena divná procenta %s
+</translation>
     </message>
     <message>
         <location filename="../core/parse-xml.c" line="2051"/>
@@ -8477,17 +8502,17 @@ Průměr</translation>
     <message>
         <location filename="../core/parse-xml.c" line="3775"/>
         <source>Can&apos;t open stylesheet %s</source>
-        <translation>Nelze otevřít stylový list %s</translation>
+        <translation>Nelze otevřít styl %s</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="558"/>
         <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"/>
+        <translation>ZŘEKNUTÍ SE ODPOVĚDNOSTI / VAROVÁNÍ: TOTO JE NOVÁ IMPLEMENTACE ALGORITMU %s A NA NĚM ZALOŽENÁ IMPLEMENTACE PLÁNOVAČE PONORŮ, KTERÁ BYLA POUZE OMEZENĚ TESTOVÁNA. SILNĚ DOPORUČUJEME NEPLÁNOVAT PONORY POUZE PODLE TĚCHTO VÝSLEDKŮ.</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="572"/>
         <source>Decompression calculation aborted due to excessive time</source>
-        <translation type="unfinished"/>
+        <translation>Výpočet dekomprese přerušen pro příliš dlouhý čas</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="574"/>
@@ -8501,22 +8526,22 @@ Průměr</translation>
     <message>
         <location filename="../core/planner.c" line="812"/>
         <source>, effective GF=%d/%d</source>
-        <translation type="unfinished"/>
+        <translation>, efektivně GF=%d/%d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="586"/>
         <source>Subsurface dive plan (surface interval </source>
-        <translation type="unfinished"/>
+        <translation>Subsurface plán ponoru (povrchový interval</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="590"/>
         <source>Subsurface dive plan</source>
-        <translation>Plán potápění Subsurface</translation>
+        <translation>Subsurface plán ponoru</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="593"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="598"/>
@@ -8526,37 +8551,37 @@ Průměr</translation>
     <message>
         <location filename="../core/planner.c" line="601"/>
         <source>duration</source>
-        <translation>Délka</translation>
+        <translation>trvání</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="604"/>
         <source>runtime</source>
-        <translation>Průběh</translation>
+        <translation>runtime</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="607"/>
         <source>gas</source>
-        <translation>Směs</translation>
+        <translation>plyn</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="650"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
-        <translation type="unfinished"/>
+        <translation>Přechod do %.*f %s v %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="658"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
-        <translation type="unfinished"/>
+        <translation>Přechod do %.*f %s v %d:%02d min - runtime %d:%02u na %s</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="671"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
-        <translation type="unfinished"/>
+        <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="678"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
-        <translation type="unfinished"/>
+        <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="723"/>
@@ -8598,47 +8623,47 @@ Průměr</translation>
     <message>
         <location filename="../core/planner.c" line="803"/>
         <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>Dekompresní model: Bühlmann ZHL-16C s GFlow = %d a GFhigh = %d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="808"/>
         <source>Deco model: VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
+        <translation>Dekompresní model: VPM-B se jmenovitým konzervatismem</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="810"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
+        <translation>Dekompresní model: VPM-B s konzervatismem +%d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="816"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>Dekompresní model: Rekreační mód založený na Bühlmann ZHL-16B s GFlow = %d a GFhigh = %d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="824"/>
         <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"/>
+        <translation>ATM tlak: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="842"/>
         <source>Gas consumption (CCR legs excluded):</source>
-        <translation type="unfinished"/>
+        <translation>Spotřeba plynu (mimo CCR etapy):</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="844"/>
         <source>Gas consumption (based on SAC</source>
-        <translation type="unfinished"/>
+        <translation>Spotřeba plynu (založená na SAC</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="869"/>
         <source>this is more gas than available in the specified cylinder!</source>
-        <translation type="unfinished"/>
+        <translation>to je více plynu než je dostupný ve dané lahvi!</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="875"/>
         <source>not enough reserve for gas sharing on ascent!</source>
-        <translation type="unfinished"/>
+        <translation>nedostatek záložního plynu pro sdílení při výstupu!</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="877"/>
@@ -8658,7 +8683,7 @@ Průměr</translation>
     <message>
         <location filename="../core/planner.c" line="907"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
-        <translation type="unfinished"/>
+        <translation>nízká hodnota pO₂ %.2f v %d:%02u s plynem %s v hloubce %.*f %s</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="1234"/>
@@ -8704,7 +8729,7 @@ D: %.1f%s
         <location filename="../core/profile.c" line="1315"/>
         <source>SAC: %.*f%s/min
 </source>
-        <translation>Spotřeba plynu (SAC): %.*f%s/min
+        <translation>SAC: %.*f%s/min
 </translation>
     </message>
     <message>
@@ -8820,40 +8845,43 @@ EADD: %d%s
         <location filename="../core/profile.c" line="1381"/>
         <source>In deco (calc)
 </source>
-        <translation>Dekomprese (spočítáno)
+        <translation>Dekomprese (vypočteno)
 </translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1384"/>
         <source>NDL: %umin (calc)
 </source>
-        <translation>NDL: %umin (calc)
+        <translation>NDL: %umin (vypočteno)
 </translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1386"/>
         <source>NDL: &gt;2h (calc)
 </source>
-        <translation type="unfinished"/>
+        <translation>NDL: &gt;2h (vypočteno)
+</translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1390"/>
         <source>TTS: %umin (calc)
 </source>
-        <translation>TTS: %umin (calc)
+        <translation>TTS: %umin (vypočteno)
 </translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1392"/>
         <source>TTS: &gt;2h (calc)
 </source>
-        <translation type="unfinished"/>
+        <translation>TTS: &gt;2h (vypočteno)
+</translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1395"/>
         <source>RBT: %umin
 </source>
-        <translation type="unfinished"/>
+        <translation>RBT: %umin
+</translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1398"/>
@@ -8866,13 +8894,14 @@ EADD: %d%s
         <location filename="../core/profile.c" line="1404"/>
         <source>Tissue %.0fmin: %.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>Tkáně %.0fmin: %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1410"/>
         <source>heartbeat: %d
 </source>
-        <translation>tep srdce: %d
+        <translation>tepová frekvence: %d
 </translation>
     </message>
     <message>
@@ -8886,7 +8915,8 @@ EADD: %d%s
         <location filename="../core/profile.c" line="1415"/>
         <source>mean depth to here %.1f%s
 </source>
-        <translation type="unfinished"/>
+        <translation>střední hodnota hloubky posud %.1f%s
+</translation>
     </message>
     <message>
         <location filename="../core/profile.c" line="1516"/>
@@ -8926,27 +8956,27 @@ EADD: %d%s
     <message>
         <location filename="../core/profile.c" line="1576"/>
         <source>%s SAC:%.*f %s</source>
-        <translation type="unfinished"/>
+        <translation>%s SAC:%.*f %s</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="67"/>
         <source>%1km</source>
-        <translation type="unfinished"/>
+        <translation>%1 km</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="69"/>
         <source>%1m</source>
-        <translation type="unfinished"/>
+        <translation>%1 m</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="73"/>
         <source>%1mi</source>
-        <translation type="unfinished"/>
+        <translation>%1 mi</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="75"/>
         <source>%1yd</source>
-        <translation type="unfinished"/>
+        <translation>%1 yd</translation>
     </message>
     <message>
         <location filename="../core/qthelper.cpp" line="91"/>
@@ -9037,12 +9067,12 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="497"/>
         <source>Trips</source>
-        <translation>Cesty</translation>
+        <translation>Výlety</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="498"/>
         <source>Statistics</source>
-        <translation>Statistika</translation>
+        <translation>Statistiky</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="499"/>
@@ -9067,12 +9097,12 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="505"/>
         <source>Divemaster</source>
-        <translation>Vedoucí skupiny potápečů</translation>
+        <translation>Divemaster</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="506"/>
         <source>Buddy</source>
-        <translation>Společník při potápění</translation>
+        <translation>Buddy</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="507"/>
@@ -9082,7 +9112,7 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="508"/>
         <source>Tags</source>
-        <translation>Značky</translation>
+        <translation>Tagy</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="509"/>
@@ -9094,7 +9124,7 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="510"/>
         <source>Show more details</source>
-        <translation>Ukázat více podrobností</translation>
+        <translation>Ukázat podrobnosti</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="513"/>
@@ -9149,12 +9179,12 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="523"/>
         <source>Min. SAC</source>
-        <translation>Nejmenší spotřeba</translation>
+        <translation>Nejmenší spotřeba (SAC)</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="524"/>
         <source>Max. SAC</source>
-        <translation>Největší spotřeba</translation>
+        <translation>Největší spotřeba (SAC)</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="525"/>
@@ -9179,22 +9209,22 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="531"/>
         <source>Dive No.</source>
-        <translation>Číslo potápění</translation>
+        <translation>Číslo ponoru</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="532"/>
         <source>Dive profile</source>
-        <translation>Profil potápění</translation>
+        <translation>Profil ponoru</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="533"/>
         <source>Dive information</source>
-        <translation>Informace o potápění</translation>
+        <translation>Informace o ponoru</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="534"/>
         <source>Dive equipment</source>
-        <translation>Vybavení pro potápění</translation>
+        <translation>Potápěčská výstroj</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="535"/>
@@ -9225,12 +9255,12 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="540"/>
         <source>Gas</source>
-        <translation>Směs</translation>
+        <translation>Plyn</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="541"/>
         <source>Weight</source>
-        <translation>Hmotnost</translation>
+        <translation>Zátěž</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="543"/>
@@ -9255,7 +9285,7 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="547"/>
         <source>Dive status</source>
-        <translation>Stav potápění</translation>
+        <translation>Status ponoru</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="242"/>
@@ -9270,7 +9300,7 @@ EADD: %d%s
     <message>
         <location filename="../core/statistics.c" line="252"/>
         <source>%dmin %dsecs</source>
-        <translation type="unfinished"/>
+        <translation>%d min %d secs</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="254"/>
@@ -9280,32 +9310,32 @@ EADD: %d%s
     <message>
         <location filename="../core/statistics.c" line="266"/>
         <source>for dives #</source>
-        <translation>pro potápění</translation>
+        <translation>pro ponory číslo</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="272"/>
         <source>for selected dives</source>
-        <translation>pro vybraná potápění</translation>
+        <translation>pro vybrané ponory</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="307"/>
         <source>for dive #%d</source>
-        <translation>pro potápění #%d</translation>
+        <translation>pro ponor číslo %d</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="309"/>
         <source>for selected dive</source>
-        <translation>pro vybrané potápění</translation>
+        <translation>pro vybraný ponor</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="311"/>
         <source>for all dives</source>
-        <translation>pro všechna potápění</translation>
+        <translation>pro všechny ponory</translation>
     </message>
     <message>
         <location filename="../core/statistics.c" line="313"/>
         <source>(no dives)</source>
-        <translation>(žádná potápění)</translation>
+        <translation>(žádné ponory)</translation>
     </message>
     <message>
         <location filename="../core/subsurfacestartup.c" line="125"/>
@@ -9375,7 +9405,7 @@ EADD: %d%s
     <message>
         <location filename="../core/subsurfacestartup.c" line="135"/>
         <source>Jul</source>
-        <translation>čeč</translation>
+        <translation>čec</translation>
     </message>
     <message>
         <location filename="../core/subsurfacestartup.c" line="135"/>
@@ -9407,25 +9437,30 @@ EADD: %d%s
         <source>Uemis Zurich: the file system is almost full.
 Disconnect/reconnect the dive computer
 and click &apos;Retry&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Uemis Zurich: souborový systém je téměř plný.
+Odpojte/znovu připojte potápěčský počítač
+a klikněte na &apos;Znovu&apos;</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="28"/>
         <source>Uemis Zurich: the file system is full.
 Disconnect/reconnect the dive computer
 and click Retry</source>
-        <translation type="unfinished"/>
+        <translation>Uemis Zurich: filesystém je plný.
+Odpojte/znovu připojte potápěčský počítač
+a klikněte na Znovu</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="29"/>
         <source>Short write to req.txt file.
 Is the Uemis Zurich plugged in correctly?</source>
-        <translation type="unfinished"/>
+        <translation>Krátký zápis do souboru req.txt.
+Je Uemis Zurich správně zapojen?</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="30"/>
         <source>No dives to download.</source>
-        <translation type="unfinished"/>
+        <translation>Žádné ponory ke stažení.</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="447"/>
@@ -9445,7 +9480,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis-downloader.c" line="497"/>
         <source>divespot #</source>
-        <translation>místo potápění #</translation>
+        <translation>potápěčský příspěvek #</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="499"/>
@@ -9455,7 +9490,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis-downloader.c" line="702"/>
         <source>wetsuit</source>
-        <translation>neoprenová kombinéza</translation>
+        <translation>mokrý oblek</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="702"/>
@@ -9470,7 +9505,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis-downloader.c" line="703"/>
         <source>shorty</source>
-        <translation>krátký</translation>
+        <translation>short</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="703"/>
@@ -9485,7 +9520,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis-downloader.c" line="703"/>
         <source>jacket</source>
-        <translation>vesta - tílko, nátělník</translation>
+        <translation>žaket</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="703"/>
@@ -9500,22 +9535,22 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis-downloader.c" line="704"/>
         <source>membrane</source>
-        <translation>blána, membrána</translation>
+        <translation>membrána</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="1234"/>
         <source>Initialise communication</source>
-        <translation>započetí komunikace</translation>
+        <translation>Započetí komunikace</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="1237"/>
         <source>Uemis init failed</source>
-        <translation>Uemis - inicializace neúspěšná</translation>
+        <translation>Uemis inicializace selhala</translation>
     </message>
     <message>
         <location filename="../core/uemis-downloader.c" line="1249"/>
         <source>Start download</source>
-        <translation>Začít nahrávání</translation>
+        <translation>Začít stahovat</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="201"/>
@@ -9525,67 +9560,67 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis.c" line="203"/>
         <source>Speed alarm</source>
-        <translation>Poplach: Rychlost</translation>
+        <translation>Poplach: rychlost</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="206"/>
         <source>Speed warning</source>
-        <translation>Upozornění: Rychlost</translation>
+        <translation>Varování: rychlost</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="208"/>
         <source>pO₂ green warning</source>
-        <translation>pO₂ Upozornění: Zelená</translation>
+        <translation>pO₂ varování zelená</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="211"/>
         <source>pO₂ ascend warning</source>
-        <translation>pO₂ Upozornění: Výstup</translation>
+        <translation>pO₂ varování výstup</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="213"/>
         <source>pO₂ ascend alarm</source>
-        <translation>pO₂ Poplach: Výstup</translation>
+        <translation>pO₂ poplach výstup</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="217"/>
         <source>Tank pressure info</source>
-        <translation>Info: Tlak v láhvi</translation>
+        <translation>Informace o tlaku v lahvi</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="219"/>
         <source>RGT warning</source>
-        <translation>Upozornění: zůstávající čas plynu</translation>
+        <translation>RGT varování</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="221"/>
         <source>RGT alert</source>
-        <translation>Poplach: zůstávající čas plynu</translation>
+        <translation>RGT poplach</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="223"/>
         <source>Tank change suggested</source>
-        <translation>Navrhovaná změna láhve</translation>
+        <translation>Návrh změny lahve</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="225"/>
         <source>Depth limit exceeded</source>
-        <translation>Překročena největší hloubka</translation>
+        <translation>Překročen hloubkový limit</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="227"/>
         <source>Max deco time warning</source>
-        <translation>Upozornění: Max. dekompresní čas</translation>
+        <translation>Varování nejdelší čas dekomprese</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="229"/>
         <source>Dive time info</source>
-        <translation>Info: Čas potápění</translation>
+        <translation>Informace času ponoru</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="231"/>
         <source>Dive time alert</source>
-        <translation>Poplach: Času potápění</translation>
+        <translation>Poplach času ponoru</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="233"/>
@@ -9595,17 +9630,17 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../core/uemis.c" line="235"/>
         <source>No tank data</source>
-        <translation>Žádné informace o láhvi</translation>
+        <translation>Žádné informace o lahvi</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="237"/>
         <source>Low battery warning</source>
-        <translation>Upozornění: Slabá baterie</translation>
+        <translation>Varování: slabá baterie</translation>
     </message>
     <message>
         <location filename="../core/uemis.c" line="239"/>
         <source>Low battery alert</source>
-        <translation>Poplach: Slabá baterie</translation>
+        <translation>Poplach: slabá baterie</translation>
     </message>
     <message>
         <location filename="../core/worldmap-save.c" line="39"/>
@@ -9655,37 +9690,37 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Built</source>
-        <translation type="unfinished"/>
+        <translation>Vyrobeno</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Sank</source>
-        <translation type="unfinished"/>
+        <translation>Potopeno</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>SankTime</source>
-        <translation type="unfinished"/>
+        <translation>Čas potopení</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Reason</source>
-        <translation type="unfinished"/>
+        <translation>Důvod</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Nationality</source>
-        <translation type="unfinished"/>
+        <translation>Národnost</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Shipyard</source>
-        <translation type="unfinished"/>
+        <translation>Loděnice</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>ShipType</source>
-        <translation type="unfinished"/>
+        <translation>Typ lodě</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="246"/>
@@ -9695,27 +9730,27 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Beam</source>
-        <translation type="unfinished"/>
+        <translation>Maximální šířka na čáře ponoru</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Draught</source>
-        <translation type="unfinished"/>
+        <translation>Ponor</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Displacement</source>
-        <translation type="unfinished"/>
+        <translation>Výtlak</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Cargo</source>
-        <translation type="unfinished"/>
+        <translation>Náklad</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="260"/>
         <source>Wreck Data</source>
-        <translation type="unfinished"/>
+        <translation>Data vraku</translation>
     </message>
     <message>
         <location filename="../smtk-import/smartrak.c" line="317"/>
@@ -9733,12 +9768,12 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="13"/>
         <source>Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface-mobile</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="105"/>
         <source>Subsurface</source>
-        <translation type="unfinished"/>
+        <translation>Subsurface</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="112"/>
@@ -9748,32 +9783,32 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="127"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Přístupové údaje ke cloudu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="141"/>
         <source>Manage dives</source>
-        <translation type="unfinished"/>
+        <translation>Spravovat ponory</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="143"/>
         <source>Add dive manually</source>
-        <translation type="unfinished"/>
+        <translation>Ručně přidat ponor</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="151"/>
         <source>Manual sync with cloud</source>
-        <translation type="unfinished"/>
+        <translation>Ruční synchronizace s cloudem</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="169"/>
         <source>Offline mode</source>
-        <translation type="unfinished"/>
+        <translation>Offline režim</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="169"/>
         <source>Enable auto cloud sync</source>
-        <translation type="unfinished"/>
+        <translation>Povolit automatickou synchronizaci s cloudem</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="189"/>
@@ -9783,27 +9818,27 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="192"/>
         <source>GPS-tag dives</source>
-        <translation type="unfinished"/>
+        <translation>GPS-tagovat ponory</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="199"/>
         <source>Upload GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Nahrát GPS data</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="206"/>
         <source>Download GPS data</source>
-        <translation type="unfinished"/>
+        <translation>Stáhnout GPS data</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="213"/>
         <source>Show GPS fixes</source>
-        <translation type="unfinished"/>
+        <translation>Zobrazit GPS pozice</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="222"/>
         <source>Clear GPS cache</source>
-        <translation type="unfinished"/>
+        <translation>Vyčistit GPS cache</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="228"/>
@@ -9813,17 +9848,17 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="239"/>
         <source>Developer</source>
-        <translation type="unfinished"/>
+        <translation>Vývojář</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="241"/>
         <source>App log</source>
-        <translation type="unfinished"/>
+        <translation>Aplikační log</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="248"/>
         <source>Theme information</source>
-        <translation type="unfinished"/>
+        <translation>Informace tématu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="255"/>
@@ -9833,17 +9868,17 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="261"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>O</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="306"/>
         <source>Run location service</source>
-        <translation type="unfinished"/>
+        <translation>Spustit lokalizační službu</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="306"/>
         <source>No GPS source available</source>
-        <translation type="unfinished"/>
+        <translation>Není dostupný žádný GPS zdroj</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="318"/>
@@ -9921,7 +9956,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
         <source>50% avg. depth to 6m</source>
-        <translation>50 % průměrné hloubky do 6m</translation>
+        <translation>50 % průměrné hloubky do 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
@@ -9936,7 +9971,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="187"/>
         <source>surface to the bottom</source>
-        <translation>Od hladiny ke dnu</translation>
+        <translation>Od hladiny na dno</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="240"/>
@@ -9946,17 +9981,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="261"/>
         <source>VPM-B deco</source>
-        <translation type="unfinished"/>
+        <translation>VPM-B dekomprese</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
         <source>Bühlmann deco</source>
-        <translation type="unfinished"/>
+        <translation>Bühlmann dekomprese</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
         <source>Reserve gas</source>
-        <translation type="unfinished"/>
+        <translation>Záložní plyn</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
@@ -9974,12 +10009,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
         <source>Postpone gas change if a stop is not required</source>
-        <translation type="unfinished"/>
+        <translation>Odložit změnu plynu, pokud není vyžadována zastávka</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="323"/>
         <source>Only switch at required stops</source>
-        <translation type="unfinished"/>
+        <translation>Přepínat pouze na vyžadovaných zastávkách</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="343"/>
@@ -10004,17 +10039,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
         <source>Last stop at 6m</source>
-        <translation>Poslední zastavení v 6 metrech</translation>
+        <translation>Poslední zastávka v 6 m</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
         <source>Maximize bottom time allowed by gas and no decompression limits</source>
-        <translation type="unfinished"/>
+        <translation>Maximalizovat čas na dně povolený plynem a ne dekompresními limity</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
         <source>Recreational mode</source>
-        <translation type="unfinished"/>
+        <translation>Rekreační režim</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
@@ -10024,17 +10059,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
         <source>Min. switch duration</source>
-        <translation type="unfinished"/>
+        <translation>Nejkratší doba přepnutí</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
         <source>Safety stop</source>
-        <translation type="unfinished"/>
+        <translation>Bezpečnostní zastávka</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
         <source>Conservatism level</source>
-        <translation type="unfinished"/>
+        <translation>Úroveň konzervatismu</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
@@ -10055,7 +10090,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
         <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
-        <translation type="unfinished"/>
+        <translation>Použito pro výpočet nejlepší směsi. Vyberte hloubku pro nejlepší směs v tabulce „Dostupné plyny“ zadáním hloubky plynu, následovaným „B“ (nejlepší trimix směs) nebo „BN“ (nejlepší nitrox směs)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
@@ -10070,7 +10105,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
         <source>Best mix END</source>
-        <translation type="unfinished"/>
+        <translation>Nejlepší směs END</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
@@ -10080,17 +10115,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
         <source>In dive plan, show runtime (absolute time) of stops</source>
-        <translation>Zobrazit průběh zastávek (absolutní čas) v plánu potápění</translation>
+        <translation>Zobrazit v plánu ponoru časy konců zastávek (absolutní čas)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
         <source>Display runtime</source>
-        <translation>Zobrazit průběh</translation>
+        <translation>Zobrazit časy konců</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
         <source>In dive plan, show duration (relative time) of stops</source>
-        <translation>V plánu potápění zobrazit trvání (poměrný čas) zastávek</translation>
+        <translation>Zobrazit v plánu ponoru trvání zastávek (relativní čas)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
@@ -10100,17 +10135,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
         <source>In diveplan, list transitions or treat them as implicit</source>
-        <translation>Zobrazit přechody v plánu potápění anebo je předpokládat implicitně</translation>
+        <translation>Zobrazit v plánu ponoru přechody nebo je považovat za implicitní</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
         <source>Display transitions in deco</source>
-        <translation>Zobrazit přechody mezi zastaveními dekomprese</translation>
+        <translation>Zobrazit přechody v dekompresi</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
         <source>Verbatim dive plan</source>
-        <translation>Podrobný plán potápění</translation>
+        <translation>Podrobný plán ponoru</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts
index b0b265507..1f471004e 100644
--- a/translations/subsurface_el_GR.ts
+++ b/translations/subsurface_el_GR.ts
@@ -5,18 +5,18 @@
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="19"/>
         <source>About Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Σχετικά με το φορητό Subsurface</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="36"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
-        <translation type="unfinished"/>
+        <translation>Μία φορητή έκδοση του ελεύθερου λογισμικού καταχώρησης καταδύσεων Subsurface</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>View your dive logs while on the go.</source>
-        <translation type="unfinished"/>
+        <translation>Δείτε τις καταχωρήσεις καταδύσεων σας οπουδήποτε και οποτεδήποτε    </translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="48"/>
@@ -24,7 +24,10 @@
 
 © Subsurface developer team
 2011-2017</source>
-        <translation type="unfinished"/>
+        <translation>Έκδοση: %1
+© Ομάδα ανάπτυξης Subsurface
+2011-2017
+</translation>
     </message>
 </context>
 <context>
@@ -32,13 +35,13 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/>
         <source>Remote Bluetooth device selection</source>
-        <translation type="unfinished"/>
+        <translation>Επιλογή απομακρυσμένης συσκευής Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/>
         <source>Discovered devices</source>
-        <translation type="unfinished"/>
+        <translation>Συσκευές που έχουν βρεθεί</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/>
@@ -50,237 +53,237 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/>
         <source>Quit</source>
-        <translation type="unfinished"/>
+        <translation>Παραίτηση</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/>
         <source>Scan</source>
-        <translation type="unfinished"/>
+        <translation>Σάρωση</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/>
         <source>Clear</source>
-        <translation type="unfinished"/>
+        <translation>Εκκαθάριση</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="29"/>
         <source>Local Bluetooth device details</source>
-        <translation type="unfinished"/>
+        <translation>Λεπτομέρειες τοπικής συσκευής Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/>
         <source>Name: </source>
-        <translation type="unfinished"/>
+        <translation>Όνομα:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/>
         <source>Address:</source>
-        <translation type="unfinished"/>
+        <translation>Διεύθυνση:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/>
         <source>Bluetooth powered on</source>
-        <translation type="unfinished"/>
+        <translation>Bluetooth σε λειτουργία</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/>
         <source>Turn on/off</source>
-        <translation type="unfinished"/>
+        <translation>Ανοικτό/Κλειστό</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/>
         <source>Select device:</source>
-        <translation type="unfinished"/>
+        <translation>Επιλογή συσκευής:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/>
         <source>Name:</source>
-        <translation type="unfinished"/>
+        <translation>Όνομα:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
         <source>Could not initialize Winsock version 2.2</source>
-        <translation type="unfinished"/>
+        <translation>Δεν μπορεί να αρχικοποιηθεί η έκδοση 2.2 του Winsock</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
         <source>Trying to turn on the local Bluetooth device...</source>
-        <translation type="unfinished"/>
+        <translation>Προσπάθεια να ανοίξει η τοπική συσκευή Bluetooth...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="137"/>
         <source>Trying to turn off the local Bluetooth device...</source>
-        <translation type="unfinished"/>
+        <translation>Προσπάθεια να κλείσει η τοπική συσκευή Bluetooth...</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
         <source>Remote devices list was cleared.</source>
-        <translation type="unfinished"/>
+        <translation>Ο κατάλογος απομακρυσμένων συσκευών εκκαθαρίστηκε.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
         <source>Scanning for remote devices...</source>
-        <translation type="unfinished"/>
+        <translation>Σάρωση για απομακρυσμένες συσκευές... </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="192"/>
         <source>Scanning finished successfully.</source>
-        <translation type="unfinished"/>
+        <translation>Η σάρωση περατώθηκε επιτυχώς. </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
         <source>The local Bluetooth device was %1.</source>
         <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
-        <translation type="unfinished"/>
+        <translation>Η τοπική συσκευή Bluetooth ήταν %1.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
         <source>turned on</source>
-        <translation type="unfinished"/>
+        <translation>ανοικτό</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
         <source>turned off</source>
-        <translation type="unfinished"/>
+        <translation>κλειστό</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
         <source>UNPAIRED</source>
-        <translation type="unfinished"/>
+        <translation>ΜΗ ΣΥΖΕΥΓΜΕΝΟ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="229"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="344"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="357"/>
         <source>PAIRED</source>
-        <translation type="unfinished"/>
+        <translation>ΣΥΖΕΥΓΜΕΝΟ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="232"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="358"/>
         <source>AUTHORIZED_PAIRED</source>
-        <translation type="unfinished"/>
+        <translation>ΕΞΟΥΣΙΟΔΟΤΗΜΕΝΟ_ΣΥΖΕΥΓΜΕΝΟ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/>
         <source>%1 (%2)   [State: %3]</source>
-        <translation type="unfinished"/>
+        <translation>%1 (%2) [Κατάσταση: %3]</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/>
         <source>The device %1 can be used for connection. You can press the Save button.</source>
-        <translation type="unfinished"/>
+        <translation>Η συσκευή %1 μπορεί να χρησιμοποιηθεί για σύνδεση. Μπορείτε να πιέσετε το κουμπί Αποθήκευση.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="262"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/>
         <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source>
-        <translation type="unfinished"/>
+        <translation>Η συσκευή %1 πρέπει να συζευχθεί ώστε να χρησιμοποιηθεί. Παρακαλώ χρησιμοποιείστε τον αρχικό κατάλογο για επιλογές σύζευξης.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="286"/>
         <source>The local device was changed.</source>
-        <translation type="unfinished"/>
+        <translation>Η τοπική συσκευή τροποποιήθηκε. </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="306"/>
         <source>Pair</source>
-        <translation type="unfinished"/>
+        <translation>Σύζευξη</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
         <source>Remove pairing</source>
-        <translation type="unfinished"/>
+        <translation>Απομάκρυνση σύζευξης</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="323"/>
         <source>Trying to pair device %1</source>
-        <translation type="unfinished"/>
+        <translation>Προσπάθεια σύζευξης συσκευής %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="327"/>
         <source>Trying to unpair device %1</source>
-        <translation type="unfinished"/>
+        <translation>Προσπάθεια αποσύζευξης συσκευής %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="340"/>
         <source>Device %1 was unpaired.</source>
-        <translation type="unfinished"/>
+        <translation>Η συσκευή %1 αποσυζεύχθηκε</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="347"/>
         <source>Device %1 was paired.</source>
-        <translation type="unfinished"/>
+        <translation>Η συσκευή %1 συζεύχθηκε</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
         <source>Device %1 was paired and is authorized.</source>
-        <translation type="unfinished"/>
+        <translation>Η συσκευή %1 συζεύχθηκε και έχει εξουσιοδοτηθεί</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
         <source>The device %1 can now be used for connection. You can press the Save button.</source>
-        <translation type="unfinished"/>
+        <translation>Η συσκευή %1 μπορεί πλέον να χρησιμοποιηθεί για σύνδεση. Μπορείτε να πιέσετε το κουμπί Αποθήκευση.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/>
         <source>Local device error: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα τοπικής συσκευής: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/>
         <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα σύζευξης. Αν η απομακρυσμένη συσκευή απαιτεί έναν συγκεκριμένο κωδικό PIN, προσπαθήστε να συζεύξετε την συσκευή χρησιμοποιώντας το λειτουργικό σας σύστημα.        </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="393"/>
         <source>Unknown error</source>
-        <translation type="unfinished"/>
+        <translation>Άγνωστο σφάλμα</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="402"/>
         <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source>
-        <translation type="unfinished"/>
+        <translation>Ο προσαρμογέας Bluetooth είναι κλειστός, ανοίξτε τον πριν προβείτε σε εύρεση.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="405"/>
         <source>Writing to or reading from the device resulted in an error.</source>
-        <translation type="unfinished"/>
+        <translation>Η εγγραφή ή η ανάγνωση από την συσκευή οδήγησε σε σφάλμα.  </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="411"/>
         <source>An unknown error has occurred.</source>
-        <translation type="unfinished"/>
+        <translation>Προέκυψε ένα άγνωστο σφάλμα.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/>
         <source>Device discovery error: %1.</source>
-        <translation type="unfinished"/>
+        <translation>Σφάλμα εύρεσης συσκευής: %1</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="444"/>
         <source>Not available</source>
-        <translation type="unfinished"/>
+        <translation>Μη διαθέσιμο</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="451"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
-        <translation type="unfinished"/>
+        <translation>Ο τοπικός προσαρμογέας Bluetooth δεν είναι προσβάσιμος.</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="501"/>
         <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source>
-        <translation type="unfinished"/>
+        <translation>Ο παράγοντας εύρεσης της συσκευής δεν δημιουργήθηκε διότι η διεύθυνση %1 δεν συμπίπτει με την φυσική διεύθυνση προσαρμογέα οποιασδήποτε τοπικής συσκευής Bluetooth.    </translation>
     </message>
 </context>
 <context>
@@ -288,12 +291,12 @@
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="625"/>
         <source>Person: </source>
-        <translation type="unfinished"/>
+        <translation>Άτομο:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/>
         <source>Searches for buddies and divemasters</source>
-        <translation type="unfinished"/>
+        <translation>Αναζήτηση για καταδυτικό ζευγάρι και divemasters</translation>
     </message>
 </context>
 <context>
@@ -301,7 +304,7 @@
     <message>
         <location filename="../qt-models/filtermodels.cpp" line="248"/>
         <source>No buddies</source>
-        <translation type="unfinished"/>
+        <translation>Χωρίς καταδυτικό ζευγάρι</translation>
     </message>
 </context>
 <context>
@@ -309,12 +312,12 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Διαπιστευτήρια νέφους</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
-        <translation type="unfinished"/>
+        <translation>Διεύθυνση ηλεκτρονικού ταχυδρομείου </translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
@@ -324,12 +327,12 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation>Προβολή κωδικού</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
         <source>PIN</source>
-        <translation type="unfinished"/>
+        <translation>PIN (προσωπικός αριθμός αναγνώρισης)</translation>
     </message>
 </context>
 <context>
@@ -337,7 +340,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Dive #</source>
-        <translation type="unfinished"/>
+        <translation>Κατάδυση #</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
@@ -362,7 +365,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>GPS</source>
-        <translation type="unfinished"/>
+        <translation>GPS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
@@ -372,27 +375,27 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Cyl. size</source>
-        <translation type="unfinished"/>
+        <translation>Μέγεθος φιάλης</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
         <source>Start pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση στην αρχή</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>End pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση στο τέλος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Max. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέγιστο Βάθος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Avg. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέσο Βάθος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
@@ -402,7 +405,7 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
         <source>Buddy</source>
-        <translation>Ζευγάρι</translation>
+        <translation>Καταδυτικό ζευγάρι</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="45"/>
@@ -437,72 +440,72 @@
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>He</source>
-        <translation>He (&apos;Ηλιο)</translation>
+        <translation>He (Ήλιο)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample time</source>
-        <translation type="unfinished"/>
+        <translation>Ώρα δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample depth</source>
-        <translation type="unfinished"/>
+        <translation>Βάθος δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample temperature</source>
-        <translation type="unfinished"/>
+        <translation>Θερμοκρασία δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample CNS</source>
-        <translation type="unfinished"/>
+        <translation>Κεντρικό Νευρικό Σύστημα δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/>
         <source>Sample NDL</source>
-        <translation type="unfinished"/>
+        <translation>Όριο μη αποσυμπίεσης δείγματος  </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/>
         <source>Sample TTS</source>
-        <translation type="unfinished"/>
+        <translation>Χρόνος για την επιφάνεια δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/>
         <source>Sample stopdepth</source>
-        <translation type="unfinished"/>
+        <translation>Βάθος στάσης δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/>
         <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/>
         <source>Sample sensor1 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας1 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/>
         <source>Sample sensor2 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας2 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/>
         <source>Sample sensor3 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας3 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/>
         <source>Sample setpoint</source>
-        <translation type="unfinished"/>
+        <translation>Καθορισθέισες τιμές δείγματος</translation>
     </message>
 </context>
 <context>
@@ -510,42 +513,42 @@
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="220"/>
         <source>Could not save the backup file %1. Error Message: %2</source>
-        <translation type="unfinished"/>
+        <translation>Αδυναμία αποθήκευσης αντίγραφου ασφαλείας %1. Μήνυμα σφάλματος: %2</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="236"/>
         <source>Could not open backup file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Αδυναμία ανοίγματος αντιγράφου ασφαλείας: %1  </translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="584"/>
         <source>Dive computer details read successfully</source>
-        <translation type="unfinished"/>
+        <translation>Οι λεπτομέρειες του καταδυτικού υπολογιστή αναγνώσθηκαν επιτυχώς </translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="593"/>
         <source>Setting successfully written to device</source>
-        <translation type="unfinished"/>
+        <translation>Οι ρυθμίσεις εγγράφηκαν επιτυχώς στην συσκευή </translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="602"/>
         <source>Device firmware successfully updated</source>
-        <translation type="unfinished"/>
+        <translation>Το υλικολογισμικό της συσκευής ενημερώθηκε με επιτυχία</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="611"/>
         <source>Device settings successfully reset</source>
-        <translation type="unfinished"/>
+        <translation>Οι ρυθμίσεις της συσκευής επαναρυθμίστηκαν επιτυχώς   </translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="627"/>
         <source>Unable to create libdivecomputer context</source>
-        <translation>Unable to create libdivecomputer context</translation>
+        <translation>Αδυναμία δημιουργίας πλαισίου του libdivecomputer</translation>
     </message>
     <message>
         <location filename="../core/configuredivecomputer.cpp" line="656"/>
         <source>Could not a establish connection to the dive computer.</source>
-        <translation type="unfinished"/>
+        <translation>Δεν μπορεί να επιτευχθεί σύνδεση με τον καταδυτικό υπολογιστή </translation>
     </message>
 </context>
 <context>
@@ -553,22 +556,22 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="14"/>
         <source>Configure dive computer</source>
-        <translation type="unfinished"/>
+        <translation>Διαμόρφωση καταδυτικού υπολογιστή</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="22"/>
         <source>Device or mount point</source>
-        <translation type="unfinished"/>
+        <translation>Συσκευή ή σημείο προσάρτησης</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
         <source>Connect via Bluetooth</source>
-        <translation type="unfinished"/>
+        <translation>Σύνδεση μέσω Bluetooth</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
         <source>Connect</source>
-        <translation type="unfinished"/>
+        <translation>Σύνδεση</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
@@ -578,7 +581,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
         <source>Retrieve available details</source>
-        <translation type="unfinished"/>
+        <translation>Επανάκτηση διαθέσιμων λεπτομερειών</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
@@ -2007,7 +2010,7 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Διαπιστευτήρια νέφους</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
@@ -2519,97 +2522,97 @@ GPS location:</source>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="928"/>
         <source>Sample time</source>
-        <translation type="unfinished"/>
+        <translation>Ώρα δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="766"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
         <source>Sample depth</source>
-        <translation type="unfinished"/>
+        <translation>Βάθος δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="768"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
         <source>Sample temperature</source>
-        <translation type="unfinished"/>
+        <translation>Θερμοκρασία δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="770"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
         <source>Sample pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="772"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
         <source>Sample sensor1 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας1 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="774"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
         <source>Sample sensor2 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας2 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="776"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
         <source>Sample sensor3 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας3 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="778"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
         <source>Sample CNS</source>
-        <translation type="unfinished"/>
+        <translation>ΚΝΣ δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="780"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
         <source>Sample NDL</source>
-        <translation type="unfinished"/>
+        <translation>Όριο μη αποσυμπίεσης δείγματος  </translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
         <source>Sample TTS</source>
-        <translation type="unfinished"/>
+        <translation>Χρόνος για την επιφάνεια δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/>
         <source>Sample stopdepth</source>
-        <translation type="unfinished"/>
+        <translation>Βάθος στάσης δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/>
         <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
         <source>Sample setpoint</source>
-        <translation type="unfinished"/>
+        <translation>Καθορισθέισες τιμές δείγματος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="762"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="932"/>
         <source>Dive #</source>
-        <translation type="unfinished"/>
+        <translation>Κατάδυση #</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
@@ -2635,13 +2638,13 @@ GPS location:</source>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="944"/>
         <source>Max. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέγιστο Βάθος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="946"/>
         <source>Avg. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέσο Βάθος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
@@ -2659,19 +2662,19 @@ GPS location:</source>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="968"/>
         <source>Cyl. size</source>
-        <translation type="unfinished"/>
+        <translation>Μέγεθος φιάλης</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="970"/>
         <source>Start pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση στην αρχή</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="972"/>
         <source>End pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση στο τέλος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
@@ -2695,7 +2698,7 @@ GPS location:</source>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="942"/>
         <source>GPS</source>
-        <translation type="unfinished"/>
+        <translation>GPS</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
@@ -3334,7 +3337,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="52"/>
         <source>Device or mount point</source>
-        <translation type="unfinished"/>
+        <translation>Συσκευή ή σημείο προσάρτησης</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
@@ -3403,12 +3406,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="236"/>
         <source>Select all</source>
-        <translation type="unfinished"/>
+        <translation>Επιλογή όλων</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/>
         <source>Unselect all</source>
-        <translation type="unfinished"/>
+        <translation>Αποεπιλογή όλων</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
@@ -3444,7 +3447,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="60"/>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="101"/>
         <source>Quit</source>
-        <translation type="unfinished"/>
+        <translation>Παραίτηση</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
@@ -3469,12 +3472,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="95"/>
         <source>Accept</source>
-        <translation type="unfinished"/>
+        <translation>Αποδοχή</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="111"/>
         <source>Select All</source>
-        <translation type="unfinished"/>
+        <translation>Επιλογή όλων</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
@@ -3631,7 +3634,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
         <source>Name: </source>
-        <translation type="unfinished"/>
+        <translation>Όνομα:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
@@ -3969,12 +3972,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="779"/>
         <source>Max. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέγιστο Βάθος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="798"/>
         <source>Avg. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέσο Βάθος</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="817"/>
@@ -4846,7 +4849,7 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="626"/>
         <source>Scan</source>
-        <translation type="unfinished"/>
+        <translation>Σάρωση</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="634"/>
@@ -4912,7 +4915,7 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <source>Save changes?</source>
-        <translation type="unfinished"/>
+        <translation>Αποθήκευση αλλαγών;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
@@ -6967,62 +6970,62 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../tests/testparse.cpp" line="313"/>
         <source>Sample time</source>
-        <translation type="unfinished"/>
+        <translation>Ώρα δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="315"/>
         <source>Sample depth</source>
-        <translation type="unfinished"/>
+        <translation>Βάθος δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="317"/>
         <source>Sample temperature</source>
-        <translation type="unfinished"/>
+        <translation>Θερμοκρασία δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="319"/>
         <source>Sample pO₂</source>
-        <translation type="unfinished"/>
+        <translation>pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="321"/>
         <source>Sample sensor1 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας1 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="323"/>
         <source>Sample sensor2 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας2 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="325"/>
         <source>Sample sensor3 pO₂</source>
-        <translation type="unfinished"/>
+        <translation>Αισθητήρας3 pO₂ δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="327"/>
         <source>Sample CNS</source>
-        <translation type="unfinished"/>
+        <translation>ΚΝΣ δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="329"/>
         <source>Sample NDL</source>
-        <translation type="unfinished"/>
+        <translation>Όριο μη αποσυμπίεσης δείγματος  </translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="331"/>
         <source>Sample TTS</source>
-        <translation type="unfinished"/>
+        <translation>Χρόνος για την επιφάνεια δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="333"/>
         <source>Sample stopdepth</source>
-        <translation type="unfinished"/>
+        <translation>Βάθος στάσης δείγματος</translation>
     </message>
     <message>
         <location filename="../tests/testparse.cpp" line="335"/>
         <source>Sample pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση δείγματος</translation>
     </message>
 </context>
 <context>
@@ -7228,7 +7231,7 @@ Not all images have timestamps in the range between
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
         <source>Accept</source>
-        <translation type="unfinished"/>
+        <translation>Αποδοχή</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
@@ -9097,7 +9100,7 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="521"/>
         <source>Max. depth</source>
-        <translation type="unfinished"/>
+        <translation>Μέγιστο Βάθος</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="522"/>
@@ -9173,12 +9176,12 @@ EADD: %d%s
     <message>
         <location filename="../core/save-html.c" line="538"/>
         <source>Start pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση στην αρχή</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="539"/>
         <source>End pressure</source>
-        <translation type="unfinished"/>
+        <translation>Πίεση στο τέλος</translation>
     </message>
     <message>
         <location filename="../core/save-html.c" line="540"/>
@@ -9706,7 +9709,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="127"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Διαπιστευτήρια νέφους</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="141"/>
@@ -9736,7 +9739,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="189"/>
         <source>GPS</source>
-        <translation type="unfinished"/>
+        <translation>GPS</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="192"/>
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts
index aed0355bf..c0e2f1e5c 100644
--- a/translations/subsurface_en_GB.ts
+++ b/translations/subsurface_en_GB.ts
@@ -1544,7 +1544,7 @@
 <context>
     <name>ContextDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
@@ -1607,42 +1607,42 @@
         <translation>Use</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="44"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="43"/>
         <source>cuft</source>
         <translation>cuft</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="47"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="229"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Clicking here will remove this cylinder.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="239"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="247"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation>Switch depth for deco. gas. Calculated using Deco. pO₂ preference, unless set manually.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="242"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
         <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="245"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
         <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="503"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="522"/>
         <source>Cylinder cannot be removed</source>
         <translation>Cylinder cannot be removed</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="504"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="523"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation>
     </message>
@@ -1770,6 +1770,11 @@
         <source>Show on map</source>
         <translation>Show on map</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
+        <source>Multiple Buddies</source>
+        <translation>Multiple buddies</translation>
+    </message>
 </context>
 <context>
     <name>DiveDetailsEdit</name>
@@ -2017,7 +2022,7 @@ GPS location:</translation>
         <translation>Please tap the &apos;+&apos; button to add a dive</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/>
         <source>No dives in dive list</source>
         <translation>No dives in dive list</translation>
     </message>
@@ -2753,6 +2758,11 @@ GPS location:</translation>
         <source>%1 dive(s)</source>
         <translation>%1 dive(s)</translation>
     </message>
+    <message>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
+        <source>Multiple Buddies</source>
+        <translation>Multiple buddies</translation>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -2795,32 +2805,32 @@ GPS location:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="142"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="327"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Final depth</source>
         <translation>Final depth</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="329"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>Run time</source>
         <translation>Run time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="331"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="336"/>
         <source>Duration</source>
         <translation>Duration</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="333"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="338"/>
         <source>Used gas</source>
         <translation>Used gas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="335"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="340"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3607,7 +3617,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GlobalDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/>
         <source>Back</source>
         <translation>Back</translation>
     </message>
@@ -4829,7 +4839,7 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="506"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="551"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Please save or cancel the current dive edit before opening a new file.</translation>
     </message>
@@ -4841,7 +4851,7 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="516"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="627"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Cancel</source>
         <translation>Cancel</translation>
     </message>
@@ -4864,9 +4874,9 @@ mixed from Air and using:
         <location filename="../desktop-widgets/mainwindow.cpp" line="662"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="809"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="917"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Warning</source>
         <translation>Warning</translation>
     </message>
@@ -4891,85 +4901,85 @@ mixed from Air and using:
         <translation>Trying to replan a dive that&apos;s not a planned dive.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Please, first finish the current edition before trying to do another.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Trying to edit a dive that&apos;s not a manually added dive.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/>
         <source>Yearly statistics</source>
         <translation>Yearly statistics</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Do you want to save the changes that you made in the file %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Do you want to save the changes that you made in the data file?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <source>Save changes?</source>
         <translation>Save changes?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Changes will be lost if you don&apos;t save them.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/>
         <source>Save file as</source>
         <translation>Save file as</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
         <source>[local cache for] %1</source>
         <translation>[local cache for] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/>
         <source>[cloud storage for] %1</source>
         <translation>[cloud storage for] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/>
         <source>Opening datafile from older version</source>
         <translation>Opening datafile from older version</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/>
         <source>Open dive log file</source>
         <translation>Open dive log file</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Contacting cloud service...</source>
         <translation>Contacting cloud service...</translation>
     </message>
@@ -5923,113 +5933,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="730"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="750"/>
         <source> (#%1 of %2)</source>
         <translation> (No.%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="733"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
         <source>Unknown dive computer</source>
         <translation>Unknown dive computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="773"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Show NDL / TTS was disabled because of excessive processing time</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1339"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1359"/>
         <source>Make first divecomputer</source>
         <translation>Make first dive computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1341"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1361"/>
         <source>Delete this divecomputer</source>
         <translation>Delete this dive computer</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1355"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Add gas change</source>
         <translation>Add gas change</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1358"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1378"/>
         <source> (Tank %1)</source>
         <translation> (Tank %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1366"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
         <source>Add set-point change</source>
         <translation>Add set-point change</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1368"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
         <source>Add bookmark</source>
         <translation>Add bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1372"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1392"/>
         <source>Edit the profile</source>
         <translation>Edit the profile</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1376"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1396"/>
         <source>Remove event</source>
         <translation>Remove event</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1401"/>
         <source>Hide similar events</source>
         <translation>Hide similar events</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1408"/>
         <source>Edit name</source>
         <translation>Edit name</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1417"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1424"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1439"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1459"/>
         <source>Unhide all events</source>
         <translation>Unhide all events</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide events</source>
         <translation>Hide events</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide all %1 events?</source>
         <translation>Hide all %1 events?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1529"/>
         <source>Remove the selected event?</source>
         <translation>Remove the selected event?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1530"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1653"/>
         <source>Edit name of bookmark</source>
         <translation>Edit name of bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1654"/>
         <source>Custom name:</source>
         <translation>Custom name:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1659"/>
         <source>Name is too long!</source>
         <translation>Name is too long.</translation>
     </message>
@@ -6042,96 +6052,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation>
         <translation>Starting...</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/>
         <source>working in no-cloud mode</source>
         <translation>working in no-cloud mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/>
         <source>no cloud credentials</source>
         <translation>no cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/>
         <source>Please enter valid cloud credentials.</source>
         <translation>Please enter valid cloud credentials.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation>Attempting to open cloud storage with new credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/>
         <source>Testing cloud credentials</source>
         <translation>Testing cloud credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation>No response from cloud server to validate the credentials</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation>Cannot connect to cloud storage - cloud account not verified</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
         <source>Cloud credentials are invalid</source>
         <translation>Cloud credentials are invalid</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation>Cannot open cloud storage: Error creating https connection</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/>
         <source>Cannot open cloud storage: %1</source>
         <translation>Cannot open cloud storage: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/>
         <source>Cannot connect to cloud storage</source>
         <translation>Cannot connect to cloud storage</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/>
         <source>Cloud storage error: %1</source>
         <translation>Cloud storage error: %1</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation>Cloud storage open successfully. No dives in dive list.</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
         <source>h</source>
         <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
         <source>sec</source>
         <translation>sec</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/>
         <source>Unknown GPS location</source>
         <translation>Unknown GPS location</translation>
     </message>
@@ -6988,62 +6998,62 @@ Not all images have timestamps in the range between
 <context>
     <name>TestParse</name>
     <message>
-        <location filename="../tests/testparse.cpp" line="308"/>
+        <location filename="../tests/testparse.cpp" line="313"/>
         <source>Sample time</source>
         <translation>Sample time</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="310"/>
+        <location filename="../tests/testparse.cpp" line="315"/>
         <source>Sample depth</source>
         <translation>Sample depth</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="312"/>
+        <location filename="../tests/testparse.cpp" line="317"/>
         <source>Sample temperature</source>
         <translation>Sample temperature</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="314"/>
+        <location filename="../tests/testparse.cpp" line="319"/>
         <source>Sample pO₂</source>
         <translation>Sample pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="316"/>
+        <location filename="../tests/testparse.cpp" line="321"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Sample sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="318"/>
+        <location filename="../tests/testparse.cpp" line="323"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Sample sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="320"/>
+        <location filename="../tests/testparse.cpp" line="325"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Sample sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="322"/>
+        <location filename="../tests/testparse.cpp" line="327"/>
         <source>Sample CNS</source>
         <translation>Sample CNS</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="324"/>
+        <location filename="../tests/testparse.cpp" line="329"/>
         <source>Sample NDL</source>
         <translation>Sample NDL</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="326"/>
+        <location filename="../tests/testparse.cpp" line="331"/>
         <source>Sample TTS</source>
         <translation>Sample TTS</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="328"/>
+        <location filename="../tests/testparse.cpp" line="333"/>
         <source>Sample stopdepth</source>
         <translation>Sample stopdepth</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="330"/>
+        <location filename="../tests/testparse.cpp" line="335"/>
         <source>Sample pressure</source>
         <translation>Sample pressure</translation>
     </message>
@@ -7662,7 +7672,7 @@ Maximum</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="737"/>
+        <location filename="../core/libdivecomputer.c" line="776"/>
         <source>Error parsing the header</source>
         <translation>Error parsing the header</translation>
     </message>
@@ -7673,7 +7683,7 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="309"/>
         <location filename="../core/cochran.c" line="315"/>
         <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="232"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
@@ -7681,7 +7691,7 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="336"/>
         <location filename="../core/cochran.c" line="390"/>
         <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="234"/>
         <source>ascent</source>
         <translation>ascent</translation>
     </message>
@@ -7693,20 +7703,20 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>maxdepth</source>
         <translation>maxdepth</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="358"/>
         <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -7715,28 +7725,28 @@ Maximum</translation>
         <location filename="../core/cochran.c" line="414"/>
         <location filename="../core/cochran.c" line="421"/>
         <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="225"/>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="242"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>gaschange</source>
         <translation>gas change</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="370"/>
         <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="233"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="379"/>
         <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="235"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>transmitter</source>
         <translation>transmitter</translation>
     </message>
@@ -7998,12 +8008,17 @@ Maximum</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1447"/>
-        <location filename="../core/planner.c" line="1450"/>
+        <location filename="../core/planner.c" line="1476"/>
+        <location filename="../core/planner.c" line="1479"/>
         <source>oxygen</source>
         <translation>oxygen</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>not used</source>
+        <translation>unused</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
@@ -8084,10 +8099,10 @@ Maximum</translation>
         <translation>(%s) or (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="490"/>
+        <location filename="../core/divelist.c" line="491"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1443"/>
-        <location filename="../core/planner.c" line="1446"/>
+        <location filename="../core/planner.c" line="1472"/>
+        <location filename="../core/planner.c" line="1475"/>
         <source>air</source>
         <translation>air</translation>
     </message>
@@ -8250,205 +8265,200 @@ Maximum</translation>
         <translation>git clone of %s failed (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/libdivecomputer.c" line="218"/>
         <location filename="../core/parse-xml.c" line="3317"/>
         <location filename="../core/uemis-downloader.c" line="134"/>
         <source>unknown</source>
         <translation>unknown</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="231"/>
         <source>none</source>
         <translation>none</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="236"/>
         <source>workload</source>
         <translation>workload</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="238"/>
         <source>violation</source>
         <translation>violation</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="239"/>
         <source>bookmark</source>
         <translation>bookmark</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="240"/>
         <source>surface</source>
         <translation>surface</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="241"/>
         <source>safety stop</source>
         <translation>safety stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="243"/>
         <source>safety stop (voluntary)</source>
         <translation>safety stop (recommended)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>safety stop (mandatory)</source>
         <translation>safety stop (mandatory)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deepstop</source>
         <translation>deep stop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (safety stop)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>below floor</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>divetime</source>
         <translation>divetime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>airtime</source>
         <translation>airtime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>heading</source>
         <translation>heading</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
         <source>tissue level warning</source>
         <translation>tissue level warning</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
-        <source>non stop time</source>
-        <translation>no-stop time</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="237"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>invalid event number</source>
         <translation>invalid event number</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="553"/>
+        <location filename="../core/libdivecomputer.c" line="592"/>
         <source>Error parsing the datetime</source>
         <translation>Error parsing the date/time</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="571"/>
+        <location filename="../core/libdivecomputer.c" line="610"/>
         <source>Dive %d: %s</source>
         <translation>Dive %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="577"/>
+        <location filename="../core/libdivecomputer.c" line="616"/>
         <source>Error parsing the divetime</source>
         <translation>Error parsing the divetime</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="587"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the maxdepth</source>
         <translation>Error parsing the maxdepth</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="606"/>
+        <location filename="../core/libdivecomputer.c" line="645"/>
         <source>Error parsing temperature</source>
         <translation>Error parsing temperature</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="626"/>
+        <location filename="../core/libdivecomputer.c" line="665"/>
         <source>Error parsing the gas mix count</source>
         <translation>Error parsing the gas mix count</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="638"/>
+        <location filename="../core/libdivecomputer.c" line="677"/>
         <source>Error obtaining water salinity</source>
         <translation>Error obtaining water salinity</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="686"/>
         <source>Error obtaining surface pressure</source>
         <translation>Error obtaining surface pressure</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="672"/>
+        <location filename="../core/libdivecomputer.c" line="711"/>
         <source>Error obtaining divemode</source>
         <translation>Error obtaining divemode</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="692"/>
+        <location filename="../core/libdivecomputer.c" line="731"/>
         <source>Error parsing the gas mix</source>
         <translation>Error parsing the gas mix</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="717"/>
+        <location filename="../core/libdivecomputer.c" line="756"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Unable to create parser for %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="762"/>
         <source>Error registering the data</source>
         <translation>Error registering data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="744"/>
+        <location filename="../core/libdivecomputer.c" line="783"/>
         <source>Error parsing the samples</source>
         <translation>Error parsing the samples</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="882"/>
+        <location filename="../core/libdivecomputer.c" line="921"/>
         <source>Event: waiting for user action</source>
         <translation>Event: waiting for user action</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="890"/>
+        <location filename="../core/libdivecomputer.c" line="929"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="954"/>
+        <location filename="../core/libdivecomputer.c" line="993"/>
         <source>Error registering the event handler.</source>
         <translation>Error registering the event handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="998"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Error registering the cancellation handler.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="980"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Dive data import error</source>
         <translation>Dive data import error</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1019"/>
+        <location filename="../core/libdivecomputer.c" line="1058"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Unable to create libdivecomputer context</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1026"/>
+        <location filename="../core/libdivecomputer.c" line="1065"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Unable to open %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1048"/>
+        <location filename="../core/libdivecomputer.c" line="1087"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Insufficient privileges to open the device %s %s (%s)</translation>
     </message>
@@ -8508,177 +8518,182 @@ Maximum</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="574"/>
-        <location filename="../core/planner.c" line="840"/>
-        <location filename="../core/planner.c" line="845"/>
-        <location filename="../core/planner.c" line="871"/>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="874"/>
+        <location filename="../core/planner.c" line="900"/>
+        <location filename="../core/planner.c" line="910"/>
         <source>Warning:</source>
         <translation>Warning:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="589"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>based on VPM-B at nominal conservatism</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="591"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>based on VPM-B at +%d conservatism</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="593"/>
+        <location filename="../core/planner.c" line="812"/>
         <source>, effective GF=%d/%d</source>
         <translation>, effective GF=%d/%d</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="597"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="602"/>
+        <location filename="../core/planner.c" line="586"/>
         <source>Subsurface dive plan (surface interval </source>
         <translation>Subsurface dive plan (surface interval </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="607"/>
+        <location filename="../core/planner.c" line="590"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface dive plan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="610"/>
-        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
-        <translation>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</translation>
+        <location filename="../core/planner.c" line="593"/>
+        <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
+        <translation>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="615"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>depth</source>
         <translation>depth</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="618"/>
+        <location filename="../core/planner.c" line="601"/>
         <source>duration</source>
         <translation>duration</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="621"/>
+        <location filename="../core/planner.c" line="604"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="624"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="667"/>
+        <location filename="../core/planner.c" line="650"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="675"/>
+        <location filename="../core/planner.c" line="658"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="688"/>
+        <location filename="../core/planner.c" line="671"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="695"/>
+        <location filename="../core/planner.c" line="678"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="740"/>
+        <location filename="../core/planner.c" line="723"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="743"/>
-        <location filename="../core/planner.c" line="747"/>
+        <location filename="../core/planner.c" line="726"/>
+        <location filename="../core/planner.c" line="730"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="756"/>
-        <location filename="../core/planner.c" line="768"/>
+        <location filename="../core/planner.c" line="739"/>
+        <location filename="../core/planner.c" line="751"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="791"/>
+        <location filename="../core/planner.c" line="774"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Switch gas to %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="776"/>
         <source>Switch gas to %s</source>
         <translation>Switch gas to %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="812"/>
+        <location filename="../core/planner.c" line="796"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="814"/>
+        <location filename="../core/planner.c" line="798"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="818"/>
+        <location filename="../core/planner.c" line="803"/>
+        <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="808"/>
+        <source>Deco model: VPM-B at nominal conservatism</source>
+        <translation>Deco model: VPM-B at nominal conservatism</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="810"/>
+        <source>Deco model: VPM-B at +%d conservatism</source>
+        <translation>Deco model: VPM-B at +%d conservatism</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="816"/>
+        <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="824"/>
+        <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
+        <translation>Atm. pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="842"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gas consumption (CCR legs excluded):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="820"/>
-        <source>Gas consumption:</source>
-        <translation>Gas consumption:</translation>
+        <location filename="../core/planner.c" line="844"/>
+        <source>Gas consumption (based on SAC</source>
+        <translation>Gas consumption (based on SAC</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="841"/>
+        <location filename="../core/planner.c" line="869"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>this is more gas than available in the specified cylinder!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="846"/>
+        <location filename="../core/planner.c" line="875"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>not enough reserve for gas sharing on ascent!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="877"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="850"/>
+        <location filename="../core/planner.c" line="879"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="897"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="878"/>
+        <location filename="../core/planner.c" line="907"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1205"/>
+        <location filename="../core/planner.c" line="1234"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Can&apos;t find gas %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1451"/>
+        <location filename="../core/planner.c" line="1480"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
@@ -9103,8 +9118,8 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="318"/>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
@@ -9675,77 +9690,77 @@ Is the Uemis Zurich plugged in correctly?</translation>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Built</source>
         <translation>Built</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Sank</source>
         <translation>Sank</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>SankTime</source>
         <translation>SankTime</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Reason</source>
         <translation>Reason</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Nationality</source>
         <translation>Nationality</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Shipyard</source>
         <translation>Shipyard</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>ShipType</source>
         <translation>ShipType</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Length</source>
         <translation>Length</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Beam</source>
         <translation>Beam</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Draught</source>
         <translation>Draught</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Displacement</source>
         <translation>Displacement</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Cargo</source>
         <translation>Cargo</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="263"/>
+        <location filename="../smtk-import/smartrak.c" line="260"/>
         <source>Wreck Data</source>
         <translation>Wreck Data</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Altitude</source>
         <translation>Altitude</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Depth</source>
         <translation>Depth</translation>
     </message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index c0035018b..6fcf3b03b 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -314,7 +314,7 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
-        <translation type="unfinished"/>
+        <translation>E-post</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
@@ -324,12 +324,12 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation>Näita salasõna</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
         <source>PIN</source>
-        <translation type="unfinished"/>
+        <translation>PIN</translation>
     </message>
 </context>
 <context>
@@ -921,13 +921,13 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
         <source> s</source>
-        <translation type="unfinished"/>
+        <translation>s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>Pikkus</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
@@ -1540,7 +1540,7 @@
 <context>
     <name>ContextDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
         <source>Actions</source>
         <translation type="unfinished"/>
     </message>
@@ -1603,42 +1603,42 @@
         <translation>Kasuta</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="44"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="43"/>
         <source>cuft</source>
         <translation>kuupjalg</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="47"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="229"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Siin klikkamine eemaldab selle ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="239"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="247"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="242"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="245"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="503"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="522"/>
         <source>Cylinder cannot be removed</source>
         <translation>Ballooni ei saa eemaldada</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="504"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="523"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone, mis pole sellel sukeldumisel kasutusel.</translation>
     </message>
@@ -1764,6 +1764,11 @@
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
+        <translation>Näita kaardil</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
+        <source>Multiple Buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1772,7 +1777,7 @@
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
-        <translation type="unfinished"/>
+        <translation>Sukeldumise #</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
@@ -1787,7 +1792,7 @@
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
-        <translation type="unfinished"/>
+        <translation>Koordinaadid:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
@@ -1828,7 +1833,7 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Dive master:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
@@ -1838,22 +1843,22 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Balloon:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
-        <translation type="unfinished"/>
+        <translation>Gaasisegu:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Algrõhk:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Lõpurõhk</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
@@ -1866,17 +1871,17 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Kuupäev:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Sügavus:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Kestus:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
@@ -1901,7 +1906,7 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Balloon:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
@@ -1911,7 +1916,7 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Dive master:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
@@ -1989,17 +1994,17 @@ GPS location:</source>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Sukeldumiste nimekiri</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Sügavus:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Kestus:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
@@ -2012,7 +2017,7 @@ GPS location:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/>
         <source>No dives in dive list</source>
         <translation type="unfinished"/>
     </message>
@@ -2748,6 +2753,11 @@ GPS location:</source>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
+        <source>Multiple Buddies</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -2790,32 +2800,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="142"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="327"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Final depth</source>
         <translation>Lõppsügavus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="329"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>Run time</source>
         <translation>Töö aeg</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="331"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="336"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="333"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="338"/>
         <source>Used gas</source>
         <translation>Kasutatud gaas</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="335"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="340"/>
         <source>CC setpoint</source>
         <translation type="unfinished"/>
     </message>
@@ -3597,9 +3607,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GlobalDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/>
         <source>Back</source>
-        <translation type="unfinished"/>
+        <translation>Tagasi</translation>
     </message>
 </context>
 <context>
@@ -3620,7 +3630,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Kuupäev:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
@@ -3630,12 +3640,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Laiuskraad:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Pikkuskraad:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
@@ -4817,7 +4827,7 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="506"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="551"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
     </message>
@@ -4829,7 +4839,7 @@ mixed from Air and using:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="516"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="627"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Cancel</source>
         <translation>Loobu</translation>
     </message>
@@ -4852,9 +4862,9 @@ mixed from Air and using:
         <location filename="../desktop-widgets/mainwindow.cpp" line="662"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="809"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="917"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Warning</source>
         <translation>Hoiatus</translation>
     </message>
@@ -4879,84 +4889,84 @@ mixed from Air and using:
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/>
         <source>Yearly statistics</source>
         <translation>Aastane statistika</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <source>Save changes?</source>
         <translation>Salvesta muudatused?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/>
         <source>Save file as</source>
         <translation>Salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/>
         <source>Open dive log file</source>
         <translation>Ava sukeldumislogi fail</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
@@ -5907,113 +5917,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="730"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="750"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 %2st)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="733"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
         <source>Unknown dive computer</source>
         <translation>Tundmatu sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="773"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1339"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1359"/>
         <source>Make first divecomputer</source>
         <translation>Loo esimene sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1341"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1361"/>
         <source>Delete this divecomputer</source>
         <translation>Kustuta see sukeldumiskompuuter</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1355"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Add gas change</source>
         <translation>Lisa gaasivahetus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1358"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1378"/>
         <source> (Tank %1)</source>
         <translation> (Balloon %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1366"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
         <source>Add set-point change</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1368"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
         <source>Add bookmark</source>
         <translation>Lisa järjehoidja</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1372"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1392"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1376"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1396"/>
         <source>Remove event</source>
         <translation>Eemalda sündmus</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1401"/>
         <source>Hide similar events</source>
         <translation>Peida sarnased sündmused</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1408"/>
         <source>Edit name</source>
         <translation>Toimeta nimi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1417"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1424"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1439"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1459"/>
         <source>Unhide all events</source>
         <translation>Peida kõik sündmused</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide events</source>
         <translation>Peida sündmused</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide all %1 events?</source>
         <translation>Peida kõik %1 sündmust?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1529"/>
         <source>Remove the selected event?</source>
         <translation>Eemalda valitud sündmus?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1530"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1653"/>
         <source>Edit name of bookmark</source>
         <translation>Toimeta järjehoidja nimi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1654"/>
         <source>Custom name:</source>
         <translation>Kohandatud nimi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1659"/>
         <source>Name is too long!</source>
         <translation>Nimi on liiga pikk!</translation>
     </message>
@@ -6026,96 +6036,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/>
         <source>Unknown GPS location</source>
         <translation type="unfinished"/>
     </message>
@@ -6967,62 +6977,62 @@ Not all images have timestamps in the range between
 <context>
     <name>TestParse</name>
     <message>
-        <location filename="../tests/testparse.cpp" line="308"/>
+        <location filename="../tests/testparse.cpp" line="313"/>
         <source>Sample time</source>
         <translation>Näidis aeg</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="310"/>
+        <location filename="../tests/testparse.cpp" line="315"/>
         <source>Sample depth</source>
         <translation>Näidis sügavus</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="312"/>
+        <location filename="../tests/testparse.cpp" line="317"/>
         <source>Sample temperature</source>
         <translation>Näidis temp</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="314"/>
+        <location filename="../tests/testparse.cpp" line="319"/>
         <source>Sample pO₂</source>
         <translation>Näidis pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="316"/>
+        <location filename="../tests/testparse.cpp" line="321"/>
         <source>Sample sensor1 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="318"/>
+        <location filename="../tests/testparse.cpp" line="323"/>
         <source>Sample sensor2 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="320"/>
+        <location filename="../tests/testparse.cpp" line="325"/>
         <source>Sample sensor3 pO₂</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="322"/>
+        <location filename="../tests/testparse.cpp" line="327"/>
         <source>Sample CNS</source>
         <translation>Näidis CNS</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="324"/>
+        <location filename="../tests/testparse.cpp" line="329"/>
         <source>Sample NDL</source>
         <translation>Näidis NDL</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="326"/>
+        <location filename="../tests/testparse.cpp" line="331"/>
         <source>Sample TTS</source>
         <translation>Näidis TTS</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="328"/>
+        <location filename="../tests/testparse.cpp" line="333"/>
         <source>Sample stopdepth</source>
         <translation>Näidis peatuse sügavus</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="330"/>
+        <location filename="../tests/testparse.cpp" line="335"/>
         <source>Sample pressure</source>
         <translation>Näidis TTS</translation>
     </message>
@@ -7640,7 +7650,7 @@ Max</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="737"/>
+        <location filename="../core/libdivecomputer.c" line="776"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7651,7 +7661,7 @@ Max</translation>
         <location filename="../core/cochran.c" line="309"/>
         <location filename="../core/cochran.c" line="315"/>
         <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="232"/>
         <source>deco stop</source>
         <translation>dekopeatus</translation>
     </message>
@@ -7659,7 +7669,7 @@ Max</translation>
         <location filename="../core/cochran.c" line="336"/>
         <location filename="../core/cochran.c" line="390"/>
         <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="234"/>
         <source>ascent</source>
         <translation>tõus</translation>
     </message>
@@ -7671,20 +7681,20 @@ Max</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>OLF</source>
         <translation>Hapnikulimiidi osa (OLF)</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>maxdepth</source>
         <translation>max sügavus</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="358"/>
         <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -7693,28 +7703,28 @@ Max</translation>
         <location filename="../core/cochran.c" line="414"/>
         <location filename="../core/cochran.c" line="421"/>
         <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="225"/>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="242"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>gaschange</source>
         <translation>gaasivahetus</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="370"/>
         <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="233"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="379"/>
         <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="235"/>
         <source>ceiling</source>
         <translation>lagi</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>transmitter</source>
         <translation>saatja</translation>
     </message>
@@ -7976,12 +7986,17 @@ Max</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1447"/>
-        <location filename="../core/planner.c" line="1450"/>
+        <location filename="../core/planner.c" line="1476"/>
+        <location filename="../core/planner.c" line="1479"/>
         <source>oxygen</source>
         <translation>hapnik</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>not used</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>paskal</translation>
@@ -8062,10 +8077,10 @@ Max</translation>
         <translation>(%s) või (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="490"/>
+        <location filename="../core/divelist.c" line="491"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1443"/>
-        <location filename="../core/planner.c" line="1446"/>
+        <location filename="../core/planner.c" line="1472"/>
+        <location filename="../core/planner.c" line="1475"/>
         <source>air</source>
         <translation>õhk</translation>
     </message>
@@ -8228,205 +8243,200 @@ Max</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/libdivecomputer.c" line="218"/>
         <location filename="../core/parse-xml.c" line="3317"/>
         <location filename="../core/uemis-downloader.c" line="134"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="231"/>
         <source>none</source>
         <translation>mitte ükski</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="236"/>
         <source>workload</source>
         <translation>töökoormus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="238"/>
         <source>violation</source>
         <translation>rikkumine</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="239"/>
         <source>bookmark</source>
         <translation>järjehoidja</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="240"/>
         <source>surface</source>
         <translation>pind</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="241"/>
         <source>safety stop</source>
         <translation>ohutuspeatus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="243"/>
         <source>safety stop (voluntary)</source>
         <translation>ohutuspeatus (vabatahtlik)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>safety stop (mandatory)</source>
         <translation>ohutuspeatus (kohustuslik)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deepstop</source>
         <translation>sügavpeatus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>ceiling (safety stop)</source>
         <translation>lagi (ohutuspeatus)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>allpool taset</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>divetime</source>
         <translation>põhjaaeg</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>airtime</source>
         <translation>aeg õhuga</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>heading</source>
         <translation>suund</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
         <source>tissue level warning</source>
         <translation>koe taseme hoiatus</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
-        <source>non stop time</source>
-        <translation>mittepeatuste aeg</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="237"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>invalid event number</source>
         <translation>vale sündmuse nr</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="553"/>
+        <location filename="../core/libdivecomputer.c" line="592"/>
         <source>Error parsing the datetime</source>
         <translation>Viga kuupäeva ja aja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="571"/>
+        <location filename="../core/libdivecomputer.c" line="610"/>
         <source>Dive %d: %s</source>
         <translation>Sukeldumine %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="577"/>
+        <location filename="../core/libdivecomputer.c" line="616"/>
         <source>Error parsing the divetime</source>
         <translation>Viga põhjaaja tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="587"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the maxdepth</source>
         <translation>Viga max sügavuse tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="606"/>
+        <location filename="../core/libdivecomputer.c" line="645"/>
         <source>Error parsing temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="626"/>
+        <location filename="../core/libdivecomputer.c" line="665"/>
         <source>Error parsing the gas mix count</source>
         <translation>Viga gaasisegude arvu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="638"/>
+        <location filename="../core/libdivecomputer.c" line="677"/>
         <source>Error obtaining water salinity</source>
         <translation>Viga vee soolsuse saamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="686"/>
         <source>Error obtaining surface pressure</source>
         <translation>Viga pinnarõhu saamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="672"/>
+        <location filename="../core/libdivecomputer.c" line="711"/>
         <source>Error obtaining divemode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="692"/>
+        <location filename="../core/libdivecomputer.c" line="731"/>
         <source>Error parsing the gas mix</source>
         <translation>Viga gaasisegu tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="717"/>
+        <location filename="../core/libdivecomputer.c" line="756"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Ei saa luua parserit %s %s jaoks</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="762"/>
         <source>Error registering the data</source>
         <translation>Viga andmete registreerimisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="744"/>
+        <location filename="../core/libdivecomputer.c" line="783"/>
         <source>Error parsing the samples</source>
         <translation>Viga proovide tuvastamisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="882"/>
+        <location filename="../core/libdivecomputer.c" line="921"/>
         <source>Event: waiting for user action</source>
         <translation>Sündmus: ootan kasutaja sekkumist</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="890"/>
+        <location filename="../core/libdivecomputer.c" line="929"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="954"/>
+        <location filename="../core/libdivecomputer.c" line="993"/>
         <source>Error registering the event handler.</source>
         <translation>Viga sündmuste draiveri registreerimisel.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="998"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Viga tühistamise draiveri registreerimisel</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="980"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Dive data import error</source>
         <translation>Viga sukeldumise andmete impordil</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1019"/>
+        <location filename="../core/libdivecomputer.c" line="1058"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Ei saa luua libdivecomputer konteksti</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1026"/>
+        <location filename="../core/libdivecomputer.c" line="1065"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Ei saa avada %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1048"/>
+        <location filename="../core/libdivecomputer.c" line="1087"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation type="unfinished"/>
     </message>
@@ -8484,177 +8494,182 @@ Max</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="574"/>
-        <location filename="../core/planner.c" line="840"/>
-        <location filename="../core/planner.c" line="845"/>
-        <location filename="../core/planner.c" line="871"/>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="874"/>
+        <location filename="../core/planner.c" line="900"/>
+        <location filename="../core/planner.c" line="910"/>
         <source>Warning:</source>
         <translation>Hoiatus:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="589"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="591"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="593"/>
+        <location filename="../core/planner.c" line="812"/>
         <source>, effective GF=%d/%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="597"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="602"/>
+        <location filename="../core/planner.c" line="586"/>
         <source>Subsurface dive plan (surface interval </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="607"/>
+        <location filename="../core/planner.c" line="590"/>
         <source>Subsurface dive plan</source>
         <translation>Subsurface sukeldumise plaan</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="610"/>
-        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <location filename="../core/planner.c" line="593"/>
+        <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="615"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>depth</source>
         <translation>sügavus</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="618"/>
+        <location filename="../core/planner.c" line="601"/>
         <source>duration</source>
         <translation>kestus</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="621"/>
+        <location filename="../core/planner.c" line="604"/>
         <source>runtime</source>
         <translation>jooksev aeg</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="624"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>gas</source>
         <translation>gaas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="667"/>
+        <location filename="../core/planner.c" line="650"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="675"/>
+        <location filename="../core/planner.c" line="658"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="688"/>
+        <location filename="../core/planner.c" line="671"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="695"/>
+        <location filename="../core/planner.c" line="678"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u %s peal</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="740"/>
+        <location filename="../core/planner.c" line="723"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="743"/>
-        <location filename="../core/planner.c" line="747"/>
+        <location filename="../core/planner.c" line="726"/>
+        <location filename="../core/planner.c" line="730"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="756"/>
-        <location filename="../core/planner.c" line="768"/>
+        <location filename="../core/planner.c" line="739"/>
+        <location filename="../core/planner.c" line="751"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="791"/>
+        <location filename="../core/planner.c" line="774"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="776"/>
         <source>Switch gas to %s</source>
         <translation>Vaheta gaasiks %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="812"/>
+        <location filename="../core/planner.c" line="796"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="814"/>
+        <location filename="../core/planner.c" line="798"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="818"/>
+        <location filename="../core/planner.c" line="803"/>
+        <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="808"/>
+        <source>Deco model: VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="810"/>
+        <source>Deco model: VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="816"/>
+        <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="824"/>
+        <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="842"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gaasikulu (CCR lõigud välja arvatud):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="820"/>
-        <source>Gas consumption:</source>
-        <translation>Gaasi tarbimine:</translation>
+        <location filename="../core/planner.c" line="844"/>
+        <source>Gas consumption (based on SAC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="841"/>
+        <location filename="../core/planner.c" line="869"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="846"/>
+        <location filename="../core/planner.c" line="875"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="877"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="850"/>
+        <location filename="../core/planner.c" line="879"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="897"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="878"/>
+        <location filename="../core/planner.c" line="907"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1205"/>
+        <location filename="../core/planner.c" line="1234"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Ei leia gaasi %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1451"/>
+        <location filename="../core/planner.c" line="1480"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
@@ -9070,8 +9085,8 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="318"/>
         <source>Notes</source>
         <translation>Märkmed</translation>
     </message>
@@ -9637,77 +9652,77 @@ Is the Uemis Zurich plugged in correctly?</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Built</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Sank</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>SankTime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Nationality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Shipyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>ShipType</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>Pikkus</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Beam</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Draught</source>
-        <translation type="unfinished"/>
+        <translation>Süvis</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Displacement</source>
-        <translation type="unfinished"/>
+        <translation>Veeväljasurve</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Cargo</source>
-        <translation type="unfinished"/>
+        <translation>Last</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="263"/>
+        <location filename="../smtk-import/smartrak.c" line="260"/>
         <source>Wreck Data</source>
-        <translation type="unfinished"/>
+        <translation>Vraki andmed</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Altitude</source>
         <translation>Kõrgus</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
@@ -9727,7 +9742,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="112"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Sukeldumiste nimekiri</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="127"/>
@@ -9742,7 +9757,7 @@ Is the Uemis Zurich plugged in correctly?</source>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="143"/>
         <source>Add dive manually</source>
-        <translation type="unfinished"/>
+        <translation>Lisa sukeldumine käsitsi</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="151"/>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 5be3da9d3..aef82ad34 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -173,7 +173,7 @@
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="358"/>
         <source>AUTHORIZED_PAIRED</source>
-        <translation>AUTHORIZED_PAIRED</translation>
+        <translation>APPAIRAGE_AUTORISÉ</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="236"/>
@@ -279,7 +279,7 @@
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="451"/>
         <source>The local Bluetooth adapter cannot be accessed.</source>
-        <translation>L&apos;adaptateur Bluetooth local ne peut être accédé.</translation>
+        <translation>Impossible de communiquer avec l&apos;interface Bluetooth locale</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="501"/>
@@ -8541,7 +8541,7 @@ Maximum</translation>
     <message>
         <location filename="../core/planner.c" line="593"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
-        <translation>Ryntime : %dmin &lt;br&gt;&lt;/div&gt;</translation>
+        <translation>Runtime : %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="598"/>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 8f1f3722b..dbca15d13 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -1772,7 +1772,7 @@
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
         <source>Multiple Buddies</source>
-        <translation type="unfinished"/>
+        <translation>מספר בני זוג</translation>
     </message>
 </context>
 <context>
@@ -2760,7 +2760,7 @@ GPS הנוכחי:</translation>
     <message>
         <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
         <source>Multiple Buddies</source>
-        <translation type="unfinished"/>
+        <translation>מספר בני זוג</translation>
     </message>
 </context>
 <context>
@@ -8016,7 +8016,7 @@ Maximum</source>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <source>not used</source>
-        <translation type="unfinished"/>
+        <translation>לא בשימוש</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="181"/>
@@ -8543,7 +8543,7 @@ Maximum</source>
     <message>
         <location filename="../core/planner.c" line="593"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"/>
+        <translation>זמן %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="598"/>
@@ -8625,27 +8625,27 @@ Maximum</source>
     <message>
         <location filename="../core/planner.c" line="803"/>
         <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>מודל דקו: Bühlmann ZHL-16B עם גרדיאנט תחתון=%d וגרדיאנט עליון =%d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="808"/>
         <source>Deco model: VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
+        <translation>מודל דקו: VPM-B בשומרנות נומינלי</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="810"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
+        <translation>מודל דקו: VPM-B ב-+%d שומרנות</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="816"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>מודל דקו: מצב ספורטיבי מבוסס על Bühlmann ZHL-16B עם גרדיאנט תחתון=%d וגרדיאנט עליון =%d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="824"/>
         <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"/>
+        <translation>לחץ אטמוספרי %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="842"/>
@@ -8655,7 +8655,7 @@ Maximum</source>
     <message>
         <location filename="../core/planner.c" line="844"/>
         <source>Gas consumption (based on SAC</source>
-        <translation type="unfinished"/>
+        <translation>צריכת גז (מבוסס SAC</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="869"/>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index 5ed099ed7..635e92606 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -25,7 +25,10 @@
 
 © Subsurface developer team
 2011-2017</source>
-        <translation type="unfinished"/>
+        <translation>Versione: %1
+
+© Subsurface developer team
+2011-2017</translation>
     </message>
 </context>
 <context>
@@ -1541,7 +1544,7 @@
 <context>
     <name>ContextDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
         <source>Actions</source>
         <translation>Azioni</translation>
     </message>
@@ -1604,42 +1607,42 @@
         <translation>Uso</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="44"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="43"/>
         <source>cuft</source>
         <translation>piedi cubi</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="47"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="229"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliccando qui si rimuove la bombola.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="239"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="247"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="242"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="245"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="503"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="522"/>
         <source>Cylinder cannot be removed</source>
         <translation>La bombola non può essere rimossa</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="504"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="523"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Questo gas è in uso. Solo le bombole che non sono in uso nell&apos;immersione possono essere rimosse.</translation>
     </message>
@@ -1767,6 +1770,11 @@ il computer selezionato?</translation>
         <source>Show on map</source>
         <translation>Mostra nella mappa</translation>
     </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
+        <source>Multiple Buddies</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>DiveDetailsEdit</name>
@@ -1883,7 +1891,7 @@ del GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
         <source>No profile to show</source>
-        <translation type="unfinished"/>
+        <translation>Nessun profilo da mostrare</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
@@ -2011,12 +2019,12 @@ del GPS:</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
-        <translation type="unfinished"/>
+        <translation>Prego premere il buttone &apos;+&apos; per aggiungere una immersione</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/>
         <source>No dives in dive list</source>
-        <translation type="unfinished"/>
+        <translation>Nessuna immersione in lista</translation>
     </message>
 </context>
 <context>
@@ -2104,12 +2112,12 @@ del GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image from web</source>
-        <translation type="unfinished"/>
+        <translation>Carica immagine dal web</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="974"/>
         <source>%1 does not appear to be an image</source>
-        <translation type="unfinished"/>
+        <translation>%1 non sembra essere una immagine</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
@@ -2190,7 +2198,7 @@ del GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
         <source>TeX</source>
-        <translation type="unfinished"/>
+        <translation>TeX</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
@@ -2425,12 +2433,12 @@ del GPS:</translation>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
         <source>Export to TeX file</source>
-        <translation type="unfinished"/>
+        <translation>Esporta in TeX file</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
         <source>TeX files (*.tex)</source>
-        <translation type="unfinished"/>
+        <translation>Files TeX (*.tex)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
@@ -2748,6 +2756,11 @@ del GPS:</translation>
     <message>
         <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
         <source>%1 dive(s)</source>
+        <translation>%1 immersione(i)</translation>
+    </message>
+    <message>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
+        <source>Multiple Buddies</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2792,32 +2805,32 @@ del GPS:</translation>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="142"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="327"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Final depth</source>
         <translation>Profondità finale</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="329"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>Run time</source>
         <translation>Run Time</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="331"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="336"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="333"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="338"/>
         <source>Used gas</source>
         <translation>Gas utilizzato</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="335"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="340"/>
         <source>CC setpoint</source>
         <translation>CC setpoint</translation>
     </message>
@@ -3149,7 +3162,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="523"/>
         <source>Photos before/during/after dive</source>
-        <translation type="unfinished"/>
+        <translation>Fot pprima/durante/dopo l&apos;immersione</translation>
     </message>
 </context>
 <context>
@@ -3432,7 +3445,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
         <source> Dive Computer:</source>
-        <translation type="unfinished"/>
+        <translation>Computer per immersioni:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
@@ -3448,12 +3461,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
         <source> Downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Immersioni scaricate</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
         <source>Date / Time</source>
-        <translation type="unfinished"/>
+        <translation>Data / Ora</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
@@ -3478,7 +3491,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
         <source>Unselect All</source>
-        <translation type="unfinished"/>
+        <translation>Deseleziona tutto</translation>
     </message>
 </context>
 <context>
@@ -3509,7 +3522,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="254"/>
         <source>To disconnect Subsurface from your Facebook account, use the &apos;Share on&apos; menu entry.</source>
-        <translation type="unfinished"/>
+        <translation>Per disconnettere subsurface dal tuo account Facebook, usa la voce di menu &apos;Condividi&apos;</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="263"/>
@@ -3604,9 +3617,9 @@ invia il testo che segue ai programmatori.
 <context>
     <name>GlobalDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/>
         <source>Back</source>
-        <translation type="unfinished"/>
+        <translation>Indietro</translation>
     </message>
 </context>
 <context>
@@ -3637,12 +3650,12 @@ invia il testo che segue ai programmatori.
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Latitudine:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Longitudine:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
@@ -3655,7 +3668,7 @@ invia il testo che segue ai programmatori.
     <message>
         <location filename="../core/gpslocation.cpp" line="121"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Posizione GPS sconosciuta</translation>
     </message>
 </context>
 <context>
@@ -4234,12 +4247,12 @@ mixati con aria e usando:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Deleting Images</source>
-        <translation type="unfinished"/>
+        <translation>Sto cancellando le immagini</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1594"/>
         <source>Are you sure you want to delete all images?</source>
-        <translation type="unfinished"/>
+        <translation>Sei sicuro di voler cancellare tutte le immagini?</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1653"/>
@@ -4254,12 +4267,12 @@ mixati con aria e usando:
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1656"/>
         <source>Delete selected images</source>
-        <translation type="unfinished"/>
+        <translation>Cancella le immagini selezionate</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="1657"/>
         <source>Delete all images</source>
-        <translation type="unfinished"/>
+        <translation>Cancella tutte le immagini</translation>
     </message>
 </context>
 <context>
@@ -4816,17 +4829,17 @@ mixati con aria e usando:
         <location filename="../desktop-widgets/mainwindow.cpp" line="332"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="363"/>
         <source>Connect to</source>
-        <translation type="unfinished"/>
+        <translation>Connetti a</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="358"/>
         <source>Disconnect from</source>
-        <translation type="unfinished"/>
+        <translation>Disconnetti da</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="506"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="551"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Per favore, salva o cancella le modifiche all&apos;immersione prima di aprire un nuovo file.</translation>
     </message>
@@ -4838,7 +4851,7 @@ mixati con aria e usando:
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="516"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="627"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
@@ -4861,9 +4874,9 @@ mixati con aria e usando:
         <location filename="../desktop-widgets/mainwindow.cpp" line="662"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="809"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="917"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Warning</source>
         <translation>Avviso</translation>
     </message>
@@ -4888,85 +4901,85 @@ mixati con aria e usando:
         <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation>Sto cercando di modificare una immersione che non è stata creata manualmente.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/>
         <source>Yearly statistics</source>
         <translation>Statistiche Annuali</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Vuoi salvare le modifiche fatte nel file %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <source>Save changes?</source>
         <translation>Salvo le modifiche?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Le modifiche saranno perse se tu non le salvi.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/>
         <source>Save file as</source>
         <translation>Apri file come</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/>
         <source>[cloud storage for] %1</source>
         <translation>[memoria cloud per] %1</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/>
         <source>Opening datafile from older version</source>
         <translation>Apertura di un file di dati da una vecchia versione</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation>Hai aperto un file di dati da una vecchia versione di Subsurface. Ti consigliamo di leggere il manuale per approfondire le modifiche apportate alla nuova versione, con particolare riguardo alla gestione dei siti di immersione che è cambiata in modo significativo.
 Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe il caso di dare un&apos;occhiata alla gestione dei siti di immersione per controllare che tutto sia a posto.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/>
         <source>Open dive log file</source>
         <translation>Apri file di log immersioni</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Contacting cloud service...</source>
         <translation>Sto contattando il servizio cloud...</translation>
     </message>
@@ -5310,17 +5323,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
         <source>Threshold for pO₂ (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Soglia per pO₂ (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
         <source>Threshold for pN₂ (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Soglia per pN₂ (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
         <source>Threshold for pHe (bar)</source>
-        <translation type="unfinished"/>
+        <translation>Soglia per pHe (bar)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
@@ -5330,7 +5343,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
         <source>CCR options:</source>
-        <translation type="unfinished"/>
+        <translation>Opzioni CCR:</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
@@ -5375,12 +5388,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
         <source>+</source>
-        <translation type="unfinished"/>
+        <translation>+</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
         <source>Bühlmann</source>
-        <translation type="unfinished"/>
+        <translation>Bühlmann</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
@@ -5453,7 +5466,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/>
         <source>Use system default</source>
-        <translation type="unfinished"/>
+        <translation>Usa il predefinito di sistema</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/>
@@ -5484,7 +5497,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/>
         <source>Short format</source>
-        <translation type="unfinished"/>
+        <translation>Formato breve</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/>
@@ -5916,113 +5929,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="730"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="750"/>
         <source> (#%1 of %2)</source>
         <translation>(nº%1 of %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="733"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
         <source>Unknown dive computer</source>
         <translation>Computer sconosciuto</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="773"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1339"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1359"/>
         <source>Make first divecomputer</source>
         <translation>Rendilo computer principale</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1341"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1361"/>
         <source>Delete this divecomputer</source>
         <translation>Cancella questo computer subacqueo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1355"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Add gas change</source>
         <translation>Aggiungi un cambio gas</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1358"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1378"/>
         <source> (Tank %1)</source>
         <translation>(Bombola %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1366"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
         <source>Add set-point change</source>
         <translation>Aggiungi un cambio di set-point</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1368"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
         <source>Add bookmark</source>
         <translation>Aggiungi un segnalibro</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1372"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1392"/>
         <source>Edit the profile</source>
         <translation>Modifica il profilo</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1376"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1396"/>
         <source>Remove event</source>
         <translation>Rimuovi evento</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1401"/>
         <source>Hide similar events</source>
         <translation>Nascondi eventi simili</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1408"/>
         <source>Edit name</source>
         <translation>Modifica il nome</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1417"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1424"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Corregge la pressione della bombola %1 (attualmente interpolata come %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1439"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1459"/>
         <source>Unhide all events</source>
         <translation>Mostra tutti gli eventi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide events</source>
         <translation>Nascondi gli eventi</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide all %1 events?</source>
         <translation>Nascondi tutti gli eventi %1?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1529"/>
         <source>Remove the selected event?</source>
         <translation>Rimuovere l&apos;evento selezionato?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1530"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1653"/>
         <source>Edit name of bookmark</source>
         <translation>Modifica il nome del bookmark</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1654"/>
         <source>Custom name:</source>
         <translation>Nome personalizzato:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1659"/>
         <source>Name is too long!</source>
         <translation>Il nome è troppo lungo</translation>
     </message>
@@ -6035,98 +6048,98 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/>
         <source>Please enter valid cloud credentials.</source>
-        <translation type="unfinished"/>
+        <translation>Prego inserire credenziali valide per il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/>
         <source>Testing cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Controlle le credenziali per il cloud</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/>
         <source>No response from cloud server to validate the credentials</source>
-        <translation type="unfinished"/>
+        <translation>Nessuna risposta del server cloud per la validazione delle credenziali</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
         <source>Cloud credentials are invalid</source>
-        <translation type="unfinished"/>
+        <translation>Le credenziali per il cloud non sono valide</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
         <source>h</source>
-        <translation type="unfinished"/>
+        <translation>h</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Posizione GPS sconosciuta</translation>
     </message>
 </context>
 <context>
@@ -6191,7 +6204,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../core/qthelper.cpp" line="873"/>
         <source>EAN</source>
-        <translation type="unfinished"/>
+        <translation>EAN</translation>
     </message>
     <message numerus="yes">
         <location filename="../core/qthelper.cpp" line="962"/>
@@ -6314,7 +6327,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/simplewidgets.cpp" line="147"/>
         <source>Renumber all dives</source>
-        <translation type="unfinished"/>
+        <translation>Rinumera le immersioni</translation>
     </message>
 </context>
 <context>
@@ -6478,7 +6491,7 @@ selezionate.</translation>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="79"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Subsurface divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="111"/>
@@ -6489,7 +6502,7 @@ selezionate.</translation>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="133"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#6ebeb9;&quot;&gt;Smartrak divelog&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
         <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="242"/>
@@ -6979,62 +6992,62 @@ selezionate.</translation>
 <context>
     <name>TestParse</name>
     <message>
-        <location filename="../tests/testparse.cpp" line="308"/>
+        <location filename="../tests/testparse.cpp" line="313"/>
         <source>Sample time</source>
         <translation>Tempo</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="310"/>
+        <location filename="../tests/testparse.cpp" line="315"/>
         <source>Sample depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="312"/>
+        <location filename="../tests/testparse.cpp" line="317"/>
         <source>Sample temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="314"/>
+        <location filename="../tests/testparse.cpp" line="319"/>
         <source>Sample pO₂</source>
         <translation>pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="316"/>
+        <location filename="../tests/testparse.cpp" line="321"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Valore campione sensore1 pO2</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="318"/>
+        <location filename="../tests/testparse.cpp" line="323"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Valore campione sensore2 pO2</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="320"/>
+        <location filename="../tests/testparse.cpp" line="325"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Valore campione sensore3 pO2</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="322"/>
+        <location filename="../tests/testparse.cpp" line="327"/>
         <source>Sample CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="324"/>
+        <location filename="../tests/testparse.cpp" line="329"/>
         <source>Sample NDL</source>
         <translation>NDL</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="326"/>
+        <location filename="../tests/testparse.cpp" line="331"/>
         <source>Sample TTS</source>
         <translation>TTS</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="328"/>
+        <location filename="../tests/testparse.cpp" line="333"/>
         <source>Sample stopdepth</source>
         <translation>Profondità della sosta</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="330"/>
+        <location filename="../tests/testparse.cpp" line="335"/>
         <source>Sample pressure</source>
         <translation>Pressione</translation>
     </message>
@@ -7155,7 +7168,7 @@ selezionate.</translation>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="252"/>
         <source>Photos before/during/after dive</source>
-        <translation type="unfinished"/>
+        <translation>Foto prima/durante/dopo l&apos;immersione</translation>
     </message>
     <message>
         <location filename="../qt-models/divetripmodel.cpp" line="255"/>
@@ -7651,7 +7664,7 @@ Media</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="737"/>
+        <location filename="../core/libdivecomputer.c" line="776"/>
         <source>Error parsing the header</source>
         <translation>Errore  nel parsing dell&apos;intestazione</translation>
     </message>
@@ -7662,7 +7675,7 @@ Media</translation>
         <location filename="../core/cochran.c" line="309"/>
         <location filename="../core/cochran.c" line="315"/>
         <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="232"/>
         <source>deco stop</source>
         <translation>deco stop</translation>
     </message>
@@ -7670,7 +7683,7 @@ Media</translation>
         <location filename="../core/cochran.c" line="336"/>
         <location filename="../core/cochran.c" line="390"/>
         <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="234"/>
         <source>ascent</source>
         <translation>risalita</translation>
     </message>
@@ -7682,20 +7695,20 @@ Media</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>maxdepth</source>
         <translation>profondità massima</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="358"/>
         <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -7704,28 +7717,28 @@ Media</translation>
         <location filename="../core/cochran.c" line="414"/>
         <location filename="../core/cochran.c" line="421"/>
         <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="225"/>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="242"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>gaschange</source>
         <translation>cambio gas</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="370"/>
         <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="233"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="379"/>
         <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="235"/>
         <source>ceiling</source>
         <translation>ceiling</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>transmitter</source>
         <translation>trasmettitore</translation>
     </message>
@@ -7987,12 +8000,17 @@ Media</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1447"/>
-        <location filename="../core/planner.c" line="1450"/>
+        <location filename="../core/planner.c" line="1476"/>
+        <location filename="../core/planner.c" line="1479"/>
         <source>oxygen</source>
         <translation>ossigeno</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>not used</source>
+        <translation>non usato</translation>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>pascal</translation>
@@ -8073,10 +8091,10 @@ Media</translation>
         <translation>(%s) o (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="490"/>
+        <location filename="../core/divelist.c" line="491"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1443"/>
-        <location filename="../core/planner.c" line="1446"/>
+        <location filename="../core/planner.c" line="1472"/>
+        <location filename="../core/planner.c" line="1475"/>
         <source>air</source>
         <translation>aria</translation>
     </message>
@@ -8239,205 +8257,200 @@ Media</translation>
         <translation>Errore (%s) nel clone git di %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/libdivecomputer.c" line="218"/>
         <location filename="../core/parse-xml.c" line="3317"/>
         <location filename="../core/uemis-downloader.c" line="134"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="231"/>
         <source>none</source>
         <translation>nessuno</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="236"/>
         <source>workload</source>
         <translation>carico di lavoro</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="238"/>
         <source>violation</source>
         <translation>violazione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="239"/>
         <source>bookmark</source>
         <translation>segnalibro</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="240"/>
         <source>surface</source>
         <translation>superficie</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="241"/>
         <source>safety stop</source>
         <translation>sosta di sicurezza</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="243"/>
         <source>safety stop (voluntary)</source>
         <translation>sosta di sicurezza (facoltativa)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>safety stop (mandatory)</source>
         <translation>sosta di sicurezza (obbligatoria)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>ceiling (safety stop)</source>
         <translation>ceiling (sosta di sicurezza)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sotto il piano</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>divetime</source>
         <translation>durata immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>airtime</source>
         <translation>tempo in aria</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>heading</source>
         <translation>intestazione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
         <source>tissue level warning</source>
         <translation>avviso del livello dei tessuti</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
-        <source>non stop time</source>
-        <translation>tempo di non stop</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="237"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>invalid event number</source>
         <translation>numero evento non valido</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="553"/>
+        <location filename="../core/libdivecomputer.c" line="592"/>
         <source>Error parsing the datetime</source>
         <translation>Errore analizzando la data/il tempo</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="571"/>
+        <location filename="../core/libdivecomputer.c" line="610"/>
         <source>Dive %d: %s</source>
         <translation>Immersione #%d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="577"/>
+        <location filename="../core/libdivecomputer.c" line="616"/>
         <source>Error parsing the divetime</source>
         <translation>Errore analizzando il tempo di immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="587"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the maxdepth</source>
         <translation>Errore analizzando la profondità massima</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="606"/>
+        <location filename="../core/libdivecomputer.c" line="645"/>
         <source>Error parsing temperature</source>
         <translation>Errore analizzando la temperatura</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="626"/>
+        <location filename="../core/libdivecomputer.c" line="665"/>
         <source>Error parsing the gas mix count</source>
         <translation>Errore analizzando il conteggio della miscela di gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="638"/>
+        <location filename="../core/libdivecomputer.c" line="677"/>
         <source>Error obtaining water salinity</source>
         <translation>Errore nell&apos;ottenimento della salinità dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="686"/>
         <source>Error obtaining surface pressure</source>
         <translation>Errore nell&apos;ottenere la pressione superficiale</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="672"/>
+        <location filename="../core/libdivecomputer.c" line="711"/>
         <source>Error obtaining divemode</source>
         <translation>Errore nell&apos;ottenere la modalità di immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="692"/>
+        <location filename="../core/libdivecomputer.c" line="731"/>
         <source>Error parsing the gas mix</source>
         <translation>Errore analizzando la miscela di gas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="717"/>
+        <location filename="../core/libdivecomputer.c" line="756"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Impossibile creare un parser per %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="762"/>
         <source>Error registering the data</source>
         <translation>Errore registrando la data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="744"/>
+        <location filename="../core/libdivecomputer.c" line="783"/>
         <source>Error parsing the samples</source>
         <translation>Errore analizzando i campioni</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="882"/>
+        <location filename="../core/libdivecomputer.c" line="921"/>
         <source>Event: waiting for user action</source>
         <translation>Evento: in attesa dell&apos; azione dell&apos;utente.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="890"/>
+        <location filename="../core/libdivecomputer.c" line="929"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="954"/>
+        <location filename="../core/libdivecomputer.c" line="993"/>
         <source>Error registering the event handler.</source>
         <translation>Errore registrando il gestore degli eventi.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="998"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Errore registrando il gestore della cancellazione.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="980"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Dive data import error</source>
         <translation>Errore importazione dati immersione</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1019"/>
+        <location filename="../core/libdivecomputer.c" line="1058"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Impossibile creare un contesto libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1026"/>
+        <location filename="../core/libdivecomputer.c" line="1065"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Impossibile aprire %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1048"/>
+        <location filename="../core/libdivecomputer.c" line="1087"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Privilegi insufficienti per aprire il dispositivo %s %s (%s)</translation>
     </message>
@@ -8498,177 +8511,182 @@ Media</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="574"/>
-        <location filename="../core/planner.c" line="840"/>
-        <location filename="../core/planner.c" line="845"/>
-        <location filename="../core/planner.c" line="871"/>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="874"/>
+        <location filename="../core/planner.c" line="900"/>
+        <location filename="../core/planner.c" line="910"/>
         <source>Warning:</source>
         <translation>Avviso</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="589"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation>basato su VPM-B senza conservatorismo.</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="591"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation>basato su VPM-B con conseratorismo +%d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="593"/>
+        <location filename="../core/planner.c" line="812"/>
         <source>, effective GF=%d/%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="597"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation>modalita ricreativa basata su Bühlmann ZHL-16B con GFlow = %d e GFhigh = %d</translation>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="602"/>
+        <location filename="../core/planner.c" line="586"/>
         <source>Subsurface dive plan (surface interval </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="607"/>
+        <location filename="../core/planner.c" line="590"/>
         <source>Subsurface dive plan</source>
         <translation>Piano di immersione di Subsurface </translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="610"/>
-        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
-        <translation type="unfinished"/>
+        <location filename="../core/planner.c" line="593"/>
+        <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
+        <translation>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="615"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>depth</source>
         <translation>profondità</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="618"/>
+        <location filename="../core/planner.c" line="601"/>
         <source>duration</source>
         <translation>durata</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="621"/>
+        <location filename="../core/planner.c" line="604"/>
         <source>runtime</source>
         <translation>runtime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="624"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>gas</source>
         <translation>gas</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="667"/>
+        <location filename="../core/planner.c" line="650"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Passare a %.*f %s in %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="675"/>
+        <location filename="../core/planner.c" line="658"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Passaggio a %.*f %s al %d:%02d min - runtime %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="688"/>
+        <location filename="../core/planner.c" line="671"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="695"/>
+        <location filename="../core/planner.c" line="678"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u con %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="740"/>
+        <location filename="../core/planner.c" line="723"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="743"/>
-        <location filename="../core/planner.c" line="747"/>
+        <location filename="../core/planner.c" line="726"/>
+        <location filename="../core/planner.c" line="730"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="756"/>
-        <location filename="../core/planner.c" line="768"/>
+        <location filename="../core/planner.c" line="739"/>
+        <location filename="../core/planner.c" line="751"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="791"/>
+        <location filename="../core/planner.c" line="774"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Cambio gas a %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="776"/>
         <source>Switch gas to %s</source>
         <translation>Passa al gas %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="812"/>
+        <location filename="../core/planner.c" line="796"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="814"/>
+        <location filename="../core/planner.c" line="798"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="818"/>
+        <location filename="../core/planner.c" line="803"/>
+        <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="808"/>
+        <source>Deco model: VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="810"/>
+        <source>Deco model: VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="816"/>
+        <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="824"/>
+        <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="842"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Consumo del gas (CCR legs escluse):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="820"/>
-        <source>Gas consumption:</source>
-        <translation>Consumo gas:</translation>
+        <location filename="../core/planner.c" line="844"/>
+        <source>Gas consumption (based on SAC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="841"/>
+        <location filename="../core/planner.c" line="869"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>il gas necessario è superiore a quello disponibile nella bombola</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="846"/>
+        <location filename="../core/planner.c" line="875"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>riserva di gas non sufficiente per la condivisione in risalita</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="877"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s nella risalita pianificata)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="850"/>
+        <location filename="../core/planner.c" line="879"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="897"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="878"/>
+        <location filename="../core/planner.c" line="907"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>Valore pO₂ basso %.2f a %d:%02u con il gas %s aalla profondità %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1205"/>
+        <location filename="../core/planner.c" line="1234"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Non trovo il gas %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1451"/>
+        <location filename="../core/planner.c" line="1480"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
@@ -9094,8 +9112,8 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="318"/>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
@@ -9666,77 +9684,77 @@ Lo Uemis Zurich e&apos; collegato correttamente?</translation>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Built</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Sank</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>SankTime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Reason</source>
         <translation>Ragione</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Nationality</source>
         <translation>Nazionalità</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Shipyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>ShipType</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Length</source>
         <translation>Lunghezza</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Beam</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Draught</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Displacement</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Cargo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="263"/>
+        <location filename="../smtk-import/smartrak.c" line="260"/>
         <source>Wreck Data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Altitude</source>
         <translation>Altitudine</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 3004d0e21..9e85303f9 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -8015,7 +8015,7 @@ Maximum</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <source>not used</source>
-        <translation type="unfinished"/>
+        <translation>niet gebruikt</translation>
     </message>
     <message>
         <location filename="../core/dive.c" line="181"/>
@@ -8542,7 +8542,7 @@ Maximum</translation>
     <message>
         <location filename="../core/planner.c" line="593"/>
         <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="598"/>
@@ -8624,27 +8624,27 @@ Maximum</translation>
     <message>
         <location filename="../core/planner.c" line="803"/>
         <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>Deco model: Bühlmann ZHL-16C met GFlow = %d en GFhigh = %d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="808"/>
         <source>Deco model: VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
+        <translation>Deco model: VPM-B op nominaal conservatisme</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="810"/>
         <source>Deco model: VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
+        <translation>Deco model: VPM-B met +%d conservatisme</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="816"/>
         <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
+        <translation>Deco model: Recreatieve mode gebaseerd op Bühlmann ZHL-16B met GFlow = %d en GFhigh = %d</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="824"/>
         <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Atmosferische druk: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="842"/>
@@ -8654,7 +8654,7 @@ Maximum</translation>
     <message>
         <location filename="../core/planner.c" line="844"/>
         <source>Gas consumption (based on SAC</source>
-        <translation type="unfinished"/>
+        <translation>Gasverbruik (gebaseerd op SAC</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="869"/>
diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts
index cfd620c08..c50e2a607 100644
--- a/translations/subsurface_ro_RO.ts
+++ b/translations/subsurface_ro_RO.ts
@@ -5,18 +5,19 @@
         <location filename="../mobile-widgets/qml/About.qml" line="10"/>
         <location filename="../mobile-widgets/qml/About.qml" line="19"/>
         <source>About Subsurface-mobile</source>
-        <translation type="unfinished"/>
+        <translation>Despre Subsurface-varianta portabila</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="36"/>
         <source>A mobile version of the free Subsurface divelog software.
 </source>
-        <translation type="unfinished"/>
+        <translation>O versiune portabila a software-ului gratuit Subsurface divelog.
+</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="37"/>
         <source>View your dive logs while on the go.</source>
-        <translation type="unfinished"/>
+        <translation>Accesati scufundarile logate in timp ce sunteti in deplasare.</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/About.qml" line="48"/>
@@ -24,7 +25,10 @@
 
 © Subsurface developer team
 2011-2017</source>
-        <translation type="unfinished"/>
+        <translation>Versiunea: %1
+
+© Echipa Subsurface
+2011-2017</translation>
     </message>
 </context>
 <context>
@@ -309,12 +313,12 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Date de conectare la Cloud</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
         <source>Email</source>
-        <translation type="unfinished"/>
+        <translation>Email</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
@@ -324,12 +328,12 @@
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation>Arata parola</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
         <source>PIN</source>
-        <translation type="unfinished"/>
+        <translation>PIN</translation>
     </message>
 </context>
 <context>
@@ -915,31 +919,31 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
         <source>End Depth</source>
-        <translation type="unfinished"/>
+        <translation>Adancime finala</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
         <source> s</source>
-        <translation type="unfinished"/>
+        <translation>s</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>Lungime</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
         <source>Start Depth</source>
-        <translation type="unfinished"/>
+        <translation>Adancime de start</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
         <source>Reset Depth</source>
-        <translation type="unfinished"/>
+        <translation>Resetare Adancime</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
@@ -1105,12 +1109,12 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
         <source>Temperature sensor offset</source>
-        <translation type="unfinished"/>
+        <translation>Deviatia senzorului de Temperatura</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1172"/>
         <source>°C</source>
-        <translation type="unfinished"/>
+        <translation>°C</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1192"/>
@@ -1540,9 +1544,9 @@
 <context>
     <name>ContextDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
         <source>Actions</source>
-        <translation type="unfinished"/>
+        <translation>Actiuni</translation>
     </message>
 </context>
 <context>
@@ -1585,7 +1589,7 @@
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
         <source>Deco switch at</source>
-        <translation type="unfinished"/>
+        <translation>Schimbare gaz deco la</translation>
     </message>
     <message>
         <location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1603,42 +1607,42 @@
         <translation>Folosește</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="44"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="43"/>
         <source>cuft</source>
         <translation>picioare cubice</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="48"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="47"/>
         <source>ℓ</source>
         <translation>ℓ</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="229"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="235"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Făcând click aici veți înlătura acest tub.</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="239"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="247"/>
         <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
-        <translation type="unfinished"/>
+        <translation>Adancime de schimbare gaz deco. Calculata folosind valoarea predefinita pO₂, daca nu a fost setata manual</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="242"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="250"/>
         <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
-        <translation type="unfinished"/>
+        <translation>Calculat folosind setarea implicita pO₂. Settind MOD se va face ajustarea O₂%,, setati  &apos;*&apos; pentru concentratia optime de O₂% la adancimea maxima</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="245"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="253"/>
         <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="503"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="522"/>
         <source>Cylinder cannot be removed</source>
         <translation>Tubul nu poate fi înlăturat</translation>
     </message>
     <message>
-        <location filename="../qt-models/cylindermodel.cpp" line="504"/>
+        <location filename="../qt-models/cylindermodel.cpp" line="523"/>
         <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
         <translation>Acest tub de gaz incă se folosește. Doar tuburile ce nu sunt folosite în scufundare pot fi șterse.</translation>
     </message>
@@ -1754,17 +1758,22 @@ computerul de scufundări selectat?</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
         <source>Dive details</source>
-        <translation type="unfinished"/>
+        <translation>Detalii scufundare</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
         <source>Delete dive</source>
-        <translation type="unfinished"/>
+        <translation>Stergere scufundare</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
         <source>Show on map</source>
-        <translation type="unfinished"/>
+        <translation>Afisare pe harta</translation>
+    </message>
+    <message>
+        <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/>
+        <source>Multiple Buddies</source>
+        <translation>Mai mult de 1 buddy</translation>
     </message>
 </context>
 <context>
@@ -1772,7 +1781,7 @@ computerul de scufundări selectat?</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
         <source>Dive %1</source>
-        <translation type="unfinished"/>
+        <translation>Scufundare %1</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
@@ -1787,18 +1796,19 @@ computerul de scufundări selectat?</translation>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
         <source>Coordinates:</source>
-        <translation type="unfinished"/>
+        <translation>Coordonate:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
         <source>Use current
 GPS location:</source>
-        <translation type="unfinished"/>
+        <translation>Foloseste posizitia
+GPS curenta:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
         <source>Depth:</source>
-        <translation type="unfinished"/>
+        <translation>Adancime:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
@@ -1808,12 +1818,12 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
         <source>Air Temp:</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura aer:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
         <source>Water Temp:</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura apa:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
@@ -1828,32 +1838,32 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Dive Master:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
         <source>Weight:</source>
-        <translation type="unfinished"/>
+        <translation>Lest:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Butelie:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
         <source>Gas mix:</source>
-        <translation type="unfinished"/>
+        <translation>Mix de gaze:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
         <source>Start Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Presiune initiala:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
         <source>End Pressure:</source>
-        <translation type="unfinished"/>
+        <translation>Presiune finala:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
@@ -1866,27 +1876,27 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Data:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Adancime:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Durata:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/>
         <source>No profile to show</source>
-        <translation type="unfinished"/>
+        <translation>Nici un profil definit</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/>
         <source>Dive Details</source>
-        <translation type="unfinished"/>
+        <translation>Detaliile scufundarii</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/>
@@ -1896,27 +1906,27 @@ GPS location:</source>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
         <source>Air Temp:</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura aer:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
         <source>Cylinder:</source>
-        <translation type="unfinished"/>
+        <translation>Butelie:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
         <source>Water Temp:</source>
-        <translation type="unfinished"/>
+        <translation>Temperatura apei:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
         <source>Dive Master:</source>
-        <translation type="unfinished"/>
+        <translation>Dive Master:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
         <source>Weight:</source>
-        <translation type="unfinished"/>
+        <translation>Lest:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
@@ -1989,32 +1999,32 @@ GPS location:</source>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Lista scufundari</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
         <source>Depth: </source>
-        <translation type="unfinished"/>
+        <translation>Adancime:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
         <source>Duration: </source>
-        <translation type="unfinished"/>
+        <translation>Durata:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Date de conectare la Cloud</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
         <source>Please tap the &apos;+&apos; button to add a dive</source>
-        <translation type="unfinished"/>
+        <translation>Apasati pe &quot;+&quot; pentru a adauga o scufundare</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+        <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/>
         <source>No dives in dive list</source>
-        <translation type="unfinished"/>
+        <translation>Nu exista nici o scufundare in lista</translation>
     </message>
 </context>
 <context>
@@ -2102,12 +2112,12 @@ GPS location:</source>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
         <source>Load image from web</source>
-        <translation type="unfinished"/>
+        <translation>Incarcati imagine din web</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="974"/>
         <source>%1 does not appear to be an image</source>
-        <translation type="unfinished"/>
+        <translation>%1 nu este o imagine</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
@@ -2370,7 +2380,7 @@ GPS location:</source>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
         <source>Write dive as TeX macros to file.</source>
-        <translation type="unfinished"/>
+        <translation>Salveaza scufundarea in fisier ca macro in format TeX</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
@@ -2423,12 +2433,12 @@ GPS location:</source>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
         <source>Export to TeX file</source>
-        <translation type="unfinished"/>
+        <translation>Exporta in fisier TeX</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
         <source>TeX files (*.tex)</source>
-        <translation type="unfinished"/>
+        <translation>Fisiere TeX (*.tex)</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
@@ -2748,6 +2758,11 @@ GPS location:</source>
         <source>%1 dive(s)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/>
+        <source>Multiple Buddies</source>
+        <translation>Mai mult de 1 buddy</translation>
+    </message>
 </context>
 <context>
     <name>DivePlanner</name>
@@ -2790,32 +2805,32 @@ GPS location:</source>
 <context>
     <name>DivePlannerPointsModel</name>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="137"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="142"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="327"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
         <source>Final depth</source>
         <translation>Adâncime finală</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="329"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
         <source>Run time</source>
         <translation>Timp de rulare</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="331"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="336"/>
         <source>Duration</source>
         <translation>Durată</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="333"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="338"/>
         <source>Used gas</source>
         <translation>Gaz folosit</translation>
     </message>
     <message>
-        <location filename="../qt-models/diveplannermodel.cpp" line="335"/>
+        <location filename="../qt-models/diveplannermodel.cpp" line="340"/>
         <source>CC setpoint</source>
         <translation>Valorare CC de refetință</translation>
     </message>
@@ -3425,12 +3440,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/>
         <source> Vendor name : </source>
-        <translation type="unfinished"/>
+        <translation>Nume producator:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/>
         <source> Dive Computer:</source>
-        <translation type="unfinished"/>
+        <translation>Computer scufundare:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="54"/>
@@ -3446,12 +3461,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/>
         <source> Downloaded dives</source>
-        <translation type="unfinished"/>
+        <translation>Scufundari descarcate:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="79"/>
         <source>Date / Time</source>
-        <translation type="unfinished"/>
+        <translation>Data/Ora</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="84"/>
@@ -3476,7 +3491,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="115"/>
         <source>Unselect All</source>
-        <translation type="unfinished"/>
+        <translation>Deselecteaza tot</translation>
     </message>
 </context>
 <context>
@@ -3601,9 +3616,9 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>GlobalDrawer</name>
     <message>
-        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/>
+        <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/>
         <source>Back</source>
-        <translation type="unfinished"/>
+        <translation>Inapoi</translation>
     </message>
 </context>
 <context>
@@ -3624,7 +3639,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
         <source>Date: </source>
-        <translation type="unfinished"/>
+        <translation>Data:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
@@ -3634,12 +3649,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
         <source>Latitude: </source>
-        <translation type="unfinished"/>
+        <translation>Latitudine:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
         <source>Longitude: </source>
-        <translation type="unfinished"/>
+        <translation>Longitudine:</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
@@ -3652,7 +3667,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../core/gpslocation.cpp" line="121"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Locatie GPS necunoscuta</translation>
     </message>
 </context>
 <context>
@@ -3820,7 +3835,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../mobile-widgets/qml/Log.qml" line="15"/>
         <location filename="../mobile-widgets/qml/Log.qml" line="23"/>
         <source>Application Log</source>
-        <translation type="unfinished"/>
+        <translation>Logul aplicatiei</translation>
     </message>
 </context>
 <context>
@@ -4098,7 +4113,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="97"/>
         <source>Freedive</source>
-        <translation type="unfinished"/>
+        <translation>Scufundare libera</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.cpp" line="303"/>
@@ -4822,7 +4837,7 @@ mixate cu aer și folosite:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="506"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="551"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/>
         <source>Please save or cancel the current dive edit before opening a new file.</source>
         <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation>
     </message>
@@ -4834,7 +4849,7 @@ mixate cu aer și folosite:</translation>
     <message>
         <location filename="../desktop-widgets/mainwindow.cpp" line="516"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="627"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Cancel</source>
         <translation>Anulează</translation>
     </message>
@@ -4857,9 +4872,9 @@ mixate cu aer și folosite:</translation>
         <location filename="../desktop-widgets/mainwindow.cpp" line="662"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="809"/>
         <location filename="../desktop-widgets/mainwindow.cpp" line="917"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Warning</source>
         <translation>Avertizare</translation>
     </message>
@@ -4884,84 +4899,84 @@ mixate cu aer și folosite:</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="992"/>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="994"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/>
         <source>Please, first finish the current edition before trying to do another.</source>
         <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="998"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/>
         <source>Trying to edit a dive that&apos;s not a manually added dive.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1045"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/>
         <source>Yearly statistics</source>
         <translation>Statistici anuale</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/>
         <source>Do you want to save the changes that you made in the file %1?</source>
         <translation>Doriți să salvați modificările efectuare în fișierul %1?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1262"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/>
         <source>Do you want to save the changes that you made in the data file?</source>
         <translation>Doriți să salvați modificările efectuare în fișierul de date?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1267"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/>
         <source>Save changes?</source>
         <translation>Doriți să salvați modificările?</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/>
         <source>Changes will be lost if you don&apos;t save them.</source>
         <translation>Modificările vor fi pierdute dacă nu le salvați.</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/>
         <source>Save file as</source>
         <translation>Salvează ca</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/>
         <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
         <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
         <source>[local cache for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/>
         <source>[cloud storage for] %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/>
         <source>Opening datafile from older version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/>
         <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly.
 Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/>
         <source>Open dive log file</source>
         <translation>Deschideți înregistrările scufundărilor</translation>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/>
         <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/>
+        <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/>
         <source>Contacting cloud service...</source>
         <translation type="unfinished"/>
     </message>
@@ -5911,113 +5926,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
 <context>
     <name>ProfileWidget2</name>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="730"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="750"/>
         <source> (#%1 of %2)</source>
         <translation>(#%1 din %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="733"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
         <source>Unknown dive computer</source>
         <translation>Calculator de scufundări necunoscut</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="753"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="773"/>
         <source>Show NDL / TTS was disabled because of excessive processing time</source>
         <translation>Arată NDL / TTS a fost dezactivat din cauza timpului excesiv de procesare</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1339"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1359"/>
         <source>Make first divecomputer</source>
         <translation>Creează primul calculator de scufundări</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1341"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1361"/>
         <source>Delete this divecomputer</source>
         <translation>Șterge acest calculator de scufundări</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1355"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
         <source>Add gas change</source>
         <translation>Adaugă gazul modificat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1358"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1378"/>
         <source> (Tank %1)</source>
         <translation> (Rezervor %1)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1366"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
         <source>Add set-point change</source>
         <translation>Adaugă modificarea punctului setat</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1368"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
         <source>Add bookmark</source>
         <translation>Adaugă marcaj</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1372"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1392"/>
         <source>Edit the profile</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1376"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1396"/>
         <source>Remove event</source>
         <translation>Șterge evenimentul</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1401"/>
         <source>Hide similar events</source>
         <translation>Ascunde evenimente similare</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1388"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1408"/>
         <source>Edit name</source>
         <translation>Modifică numele</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1417"/>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1424"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1437"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
         <source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
         <translation>Ajustează presiunea rezervorului %1 (în momentul de față aceasta este interpolată ca %2)</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1439"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1459"/>
         <source>Unhide all events</source>
         <translation>Arată toate evenimentele</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide events</source>
         <translation>Ascunde evenimente</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1474"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1494"/>
         <source>Hide all %1 events?</source>
         <translation>Ascunde toate %1 evenimentele?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1529"/>
         <source>Remove the selected event?</source>
         <translation>Înlătură evenimentul selectat?</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1510"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1530"/>
         <source>%1 @ %2:%3</source>
         <translation>%1 @ %2:%3</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1653"/>
         <source>Edit name of bookmark</source>
         <translation>Modifică numele marcajului</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1634"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1654"/>
         <source>Custom name:</source>
         <translation>Nume presonalizat:</translation>
     </message>
     <message>
-        <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+        <location filename="../profile-widget/profilewidget2.cpp" line="1659"/>
         <source>Name is too long!</source>
         <translation>Numele este prea lung</translation>
     </message>
@@ -6030,98 +6045,98 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/>
         <source>working in no-cloud mode</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/>
         <source>no cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/>
         <source>Please enter valid cloud credentials.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/>
         <source>Attempting to open cloud storage with new credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/>
         <source>Testing cloud credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/>
         <source>No response from cloud server to validate the credentials</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
         <source>Cannot connect to cloud storage - cloud account not verified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/>
         <source>Cloud credentials are invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/>
         <source>Cannot open cloud storage: Error creating https connection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/>
         <source>Cannot open cloud storage: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/>
         <source>Cannot connect to cloud storage</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/>
         <source>Cloud storage error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/>
         <source>Failed to connect to cloud server, reverting to no cloud status</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/>
         <source>Cloud storage open successfully. No dives in dive list.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
         <source>h</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/>
         <source>sec</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
+        <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/>
         <source>Unknown GPS location</source>
-        <translation type="unfinished"/>
+        <translation>Locatie GPS necunoscuta</translation>
     </message>
 </context>
 <context>
@@ -6971,62 +6986,62 @@ Not all images have timestamps in the range between
 <context>
     <name>TestParse</name>
     <message>
-        <location filename="../tests/testparse.cpp" line="308"/>
+        <location filename="../tests/testparse.cpp" line="313"/>
         <source>Sample time</source>
         <translation>Timp de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="310"/>
+        <location filename="../tests/testparse.cpp" line="315"/>
         <source>Sample depth</source>
         <translation>Adâncime de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="312"/>
+        <location filename="../tests/testparse.cpp" line="317"/>
         <source>Sample temperature</source>
         <translation>Temperatură de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="314"/>
+        <location filename="../tests/testparse.cpp" line="319"/>
         <source>Sample pO₂</source>
         <translation>pO₂ de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="316"/>
+        <location filename="../tests/testparse.cpp" line="321"/>
         <source>Sample sensor1 pO₂</source>
         <translation>Exemplu sensor1 pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="318"/>
+        <location filename="../tests/testparse.cpp" line="323"/>
         <source>Sample sensor2 pO₂</source>
         <translation>Exemplu sensor2 pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="320"/>
+        <location filename="../tests/testparse.cpp" line="325"/>
         <source>Sample sensor3 pO₂</source>
         <translation>Exemplu sensor3 pO₂</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="322"/>
+        <location filename="../tests/testparse.cpp" line="327"/>
         <source>Sample CNS</source>
         <translation>CNS de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="324"/>
+        <location filename="../tests/testparse.cpp" line="329"/>
         <source>Sample NDL</source>
         <translation>NDL de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="326"/>
+        <location filename="../tests/testparse.cpp" line="331"/>
         <source>Sample TTS</source>
         <translation>TTS de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="328"/>
+        <location filename="../tests/testparse.cpp" line="333"/>
         <source>Sample stopdepth</source>
         <translation>Limită de adâncime de probă</translation>
     </message>
     <message>
-        <location filename="../tests/testparse.cpp" line="330"/>
+        <location filename="../tests/testparse.cpp" line="335"/>
         <source>Sample pressure</source>
         <translation>Presiune de probă</translation>
     </message>
@@ -7644,7 +7659,7 @@ Medie</translation>
 <context>
     <name>getextFromC</name>
     <message>
-        <location filename="../core/libdivecomputer.c" line="737"/>
+        <location filename="../core/libdivecomputer.c" line="776"/>
         <source>Error parsing the header</source>
         <translation type="unfinished"/>
     </message>
@@ -7655,7 +7670,7 @@ Medie</translation>
         <location filename="../core/cochran.c" line="309"/>
         <location filename="../core/cochran.c" line="315"/>
         <location filename="../core/cochran.c" line="385"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="232"/>
         <source>deco stop</source>
         <translation>oprire de decompresie</translation>
     </message>
@@ -7663,7 +7678,7 @@ Medie</translation>
         <location filename="../core/cochran.c" line="336"/>
         <location filename="../core/cochran.c" line="390"/>
         <location filename="../core/file.c" line="777"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="234"/>
         <source>ascent</source>
         <translation>ascensiune</translation>
     </message>
@@ -7675,20 +7690,20 @@ Medie</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="348"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="250"/>
         <source>OLF</source>
         <translation>OLF</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="353"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="249"/>
         <source>maxdepth</source>
         <translation>adâncime maximă</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="358"/>
         <location filename="../core/cochran.c" line="404"/>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="251"/>
         <source>pO₂</source>
         <translation>pO₂</translation>
     </message>
@@ -7697,28 +7712,28 @@ Medie</translation>
         <location filename="../core/cochran.c" line="414"/>
         <location filename="../core/cochran.c" line="421"/>
         <location filename="../core/file.c" line="868"/>
-        <location filename="../core/libdivecomputer.c" line="225"/>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="242"/>
+        <location filename="../core/libdivecomputer.c" line="256"/>
         <source>gaschange</source>
         <translation>schimbarea gazului</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="370"/>
         <location filename="../core/cochran.c" line="409"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="233"/>
         <source>rbt</source>
         <translation>rbt</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="379"/>
         <location filename="../core/cochran.c" line="426"/>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="235"/>
         <source>ceiling</source>
         <translation>plafon</translation>
     </message>
     <message>
         <location filename="../core/cochran.c" line="395"/>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="237"/>
         <source>transmitter</source>
         <translation>transmițător</translation>
     </message>
@@ -7980,12 +7995,17 @@ Medie</translation>
     <message>
         <location filename="../core/dive.c" line="33"/>
         <location filename="../core/equipment.c" line="88"/>
-        <location filename="../core/planner.c" line="1447"/>
-        <location filename="../core/planner.c" line="1450"/>
+        <location filename="../core/planner.c" line="1476"/>
+        <location filename="../core/planner.c" line="1479"/>
         <source>oxygen</source>
         <translation>oxigen</translation>
     </message>
     <message>
+        <location filename="../core/dive.c" line="33"/>
+        <source>not used</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../core/dive.c" line="181"/>
         <source>pascal</source>
         <translation>Pascal</translation>
@@ -8066,10 +8086,10 @@ Medie</translation>
         <translation>(%s) sau (%s)</translation>
     </message>
     <message>
-        <location filename="../core/divelist.c" line="490"/>
+        <location filename="../core/divelist.c" line="491"/>
         <location filename="../core/equipment.c" line="84"/>
-        <location filename="../core/planner.c" line="1443"/>
-        <location filename="../core/planner.c" line="1446"/>
+        <location filename="../core/planner.c" line="1472"/>
+        <location filename="../core/planner.c" line="1475"/>
         <source>air</source>
         <translation>aer</translation>
     </message>
@@ -8232,205 +8252,200 @@ Medie</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="210"/>
+        <location filename="../core/libdivecomputer.c" line="218"/>
         <location filename="../core/parse-xml.c" line="3317"/>
         <location filename="../core/uemis-downloader.c" line="134"/>
         <source>unknown</source>
         <translation>necunoscut</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="231"/>
         <source>none</source>
         <translation>niciunul</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="223"/>
+        <location filename="../core/libdivecomputer.c" line="236"/>
         <source>workload</source>
         <translation>volum de muncă</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="238"/>
         <source>violation</source>
         <translation>încălcare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="239"/>
         <source>bookmark</source>
         <translation>semn de carte</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="240"/>
         <source>surface</source>
         <translation>suprafață</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="224"/>
+        <location filename="../core/libdivecomputer.c" line="241"/>
         <source>safety stop</source>
         <translation>oprire pentru siguranță</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="243"/>
         <source>safety stop (voluntary)</source>
         <translation>oprire pentru siguranță (voluntară)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="225"/>
+        <location filename="../core/libdivecomputer.c" line="244"/>
         <source>safety stop (mandatory)</source>
         <translation>oprire pentru siguranță (obligatorie)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="245"/>
         <source>deepstop</source>
         <translation>deepstop</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="246"/>
         <source>ceiling (safety stop)</source>
         <translation>plafon (oprire pentru siguranță)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="247"/>
         <source>below floor</source>
         <comment>event showing dive is below deco floor and adding deco time</comment>
         <translation>sub limită</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="226"/>
+        <location filename="../core/libdivecomputer.c" line="248"/>
         <source>divetime</source>
         <translation>timp scufundare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="252"/>
         <source>airtime</source>
         <translation>timp aer rămas</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="253"/>
         <source>rgbm</source>
         <translation>rgbm</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="227"/>
+        <location filename="../core/libdivecomputer.c" line="254"/>
         <source>heading</source>
         <translation>direcție</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
+        <location filename="../core/libdivecomputer.c" line="255"/>
         <source>tissue level warning</source>
         <translation>avertizare nivel țesut</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="228"/>
-        <source>non stop time</source>
-        <translation>timp fără oprire</translation>
-    </message>
-    <message>
-        <location filename="../core/libdivecomputer.c" line="237"/>
+        <location filename="../core/libdivecomputer.c" line="265"/>
         <source>invalid event number</source>
         <translation>numărul evenimentul este invalid</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="553"/>
+        <location filename="../core/libdivecomputer.c" line="592"/>
         <source>Error parsing the datetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="571"/>
+        <location filename="../core/libdivecomputer.c" line="610"/>
         <source>Dive %d: %s</source>
         <translation>Scufundarea %d: %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="577"/>
+        <location filename="../core/libdivecomputer.c" line="616"/>
         <source>Error parsing the divetime</source>
         <translation>Eroare parsând data</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="587"/>
+        <location filename="../core/libdivecomputer.c" line="626"/>
         <source>Error parsing the maxdepth</source>
         <translation>Eroare parsând adâncimea maximă</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="606"/>
+        <location filename="../core/libdivecomputer.c" line="645"/>
         <source>Error parsing temperature</source>
         <translation>Eroare parsând temperatura</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="626"/>
+        <location filename="../core/libdivecomputer.c" line="665"/>
         <source>Error parsing the gas mix count</source>
         <translation>Eroare parsând valoarea amestecului de gaz</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="638"/>
+        <location filename="../core/libdivecomputer.c" line="677"/>
         <source>Error obtaining water salinity</source>
         <translation>Eroare obținând salinitatea apei</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="647"/>
+        <location filename="../core/libdivecomputer.c" line="686"/>
         <source>Error obtaining surface pressure</source>
         <translation>Eroare obținând presiunea la suprafață</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="672"/>
+        <location filename="../core/libdivecomputer.c" line="711"/>
         <source>Error obtaining divemode</source>
         <translation>Eroare la obținerea modului de scufundare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="692"/>
+        <location filename="../core/libdivecomputer.c" line="731"/>
         <source>Error parsing the gas mix</source>
         <translation>Eroare parsând amestecul de gaz</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="717"/>
+        <location filename="../core/libdivecomputer.c" line="756"/>
         <source>Unable to create parser for %s %s</source>
         <translation>Nu s-a putut crea parser pentru %s %s</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="723"/>
+        <location filename="../core/libdivecomputer.c" line="762"/>
         <source>Error registering the data</source>
         <translation>Eroare înregistrând datele</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="744"/>
+        <location filename="../core/libdivecomputer.c" line="783"/>
         <source>Error parsing the samples</source>
         <translation>Eroare parsând eșantioanele</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="882"/>
+        <location filename="../core/libdivecomputer.c" line="921"/>
         <source>Event: waiting for user action</source>
         <translation>Eveniment: aștept acțiunea utilizatorului</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="890"/>
+        <location filename="../core/libdivecomputer.c" line="929"/>
         <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
         <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="954"/>
+        <location filename="../core/libdivecomputer.c" line="993"/>
         <source>Error registering the event handler.</source>
         <translation>Eroare la înregistrarea handlerului de evenimente.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="959"/>
+        <location filename="../core/libdivecomputer.c" line="998"/>
         <source>Error registering the cancellation handler.</source>
         <translation>Eroare la înregistrarea handlerului de anulare.</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="980"/>
+        <location filename="../core/libdivecomputer.c" line="1019"/>
         <source>Dive data import error</source>
         <translation>Eroare la importarea datelor despre scufundare</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1019"/>
+        <location filename="../core/libdivecomputer.c" line="1058"/>
         <source>Unable to create libdivecomputer context</source>
         <translation>Nu s-a putut crea contextul libdivecomputer</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1026"/>
+        <location filename="../core/libdivecomputer.c" line="1065"/>
         <source>Unable to open %s %s (%s)</source>
         <translation>Nu s-a putut deschide %s %s (%s)</translation>
     </message>
     <message>
-        <location filename="../core/libdivecomputer.c" line="1048"/>
+        <location filename="../core/libdivecomputer.c" line="1087"/>
         <source>Insufficient privileges to open the device %s %s (%s)</source>
         <translation>Nu aveți drepturi suficiente pentru a deschide dispozitivul %s %s (%s)</translation>
     </message>
@@ -8488,177 +8503,182 @@ Medie</translation>
     </message>
     <message>
         <location filename="../core/planner.c" line="574"/>
-        <location filename="../core/planner.c" line="840"/>
-        <location filename="../core/planner.c" line="845"/>
-        <location filename="../core/planner.c" line="871"/>
-        <location filename="../core/planner.c" line="881"/>
+        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="874"/>
+        <location filename="../core/planner.c" line="900"/>
+        <location filename="../core/planner.c" line="910"/>
         <source>Warning:</source>
         <translation>Avertizare:</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="584"/>
-        <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="589"/>
-        <source>based on VPM-B at nominal conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="591"/>
-        <source>based on VPM-B at +%d conservatism</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="593"/>
+        <location filename="../core/planner.c" line="812"/>
         <source>, effective GF=%d/%d</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="597"/>
-        <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../core/planner.c" line="602"/>
+        <location filename="../core/planner.c" line="586"/>
         <source>Subsurface dive plan (surface interval </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="607"/>
+        <location filename="../core/planner.c" line="590"/>
         <source>Subsurface dive plan</source>
         <translation>Planul de scufundare Subsurface</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="610"/>
-        <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+        <location filename="../core/planner.c" line="593"/>
+        <source>Runtime: %dmin&lt;br&gt;&lt;/div&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="615"/>
+        <location filename="../core/planner.c" line="598"/>
         <source>depth</source>
         <translation>adâncime</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="618"/>
+        <location filename="../core/planner.c" line="601"/>
         <source>duration</source>
         <translation>durată</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="621"/>
+        <location filename="../core/planner.c" line="604"/>
         <source>runtime</source>
         <translation>timp de rulare</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="624"/>
+        <location filename="../core/planner.c" line="607"/>
         <source>gas</source>
         <translation>gaz</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="667"/>
+        <location filename="../core/planner.c" line="650"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Tranziția la %.*f %s în %d:%02d min - timp de rulare %d:%02u în %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="675"/>
+        <location filename="../core/planner.c" line="658"/>
         <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Tranziția la %.*f %s în %d:%02d min - timp de rulare %d:%02u în %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="688"/>
+        <location filename="../core/planner.c" line="671"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
         <translation>Stai la %.*f %s pentru %d:%02d min - timp de rulare %d:%02u în %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="695"/>
+        <location filename="../core/planner.c" line="678"/>
         <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
         <translation>Stai la %.*f %s pentru %d:%02d min - timp de rulare %d:%02u în %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="740"/>
+        <location filename="../core/planner.c" line="723"/>
         <source>%3.0f%s</source>
         <translation>%3.0f%s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="743"/>
-        <location filename="../core/planner.c" line="747"/>
+        <location filename="../core/planner.c" line="726"/>
+        <location filename="../core/planner.c" line="730"/>
         <source>%3dmin</source>
         <translation>%3dmin</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="756"/>
-        <location filename="../core/planner.c" line="768"/>
+        <location filename="../core/planner.c" line="739"/>
+        <location filename="../core/planner.c" line="751"/>
         <source>(SP = %.1fbar)</source>
         <translation>(SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="791"/>
+        <location filename="../core/planner.c" line="774"/>
         <source>Switch gas to %s (SP = %.1fbar)</source>
         <translation>Schimbă gazul la %s (SP = %.1fbar)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="793"/>
+        <location filename="../core/planner.c" line="776"/>
         <source>Switch gas to %s</source>
         <translation>Schimbă gazul la %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="812"/>
+        <location filename="../core/planner.c" line="796"/>
         <source>CNS</source>
         <translation>CNS</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="814"/>
+        <location filename="../core/planner.c" line="798"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="818"/>
+        <location filename="../core/planner.c" line="803"/>
+        <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="808"/>
+        <source>Deco model: VPM-B at nominal conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="810"/>
+        <source>Deco model: VPM-B at +%d conservatism</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="816"/>
+        <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="824"/>
+        <source>ATM pressure: %dmbar (%d%s)&lt;br&gt;&lt;/div&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../core/planner.c" line="842"/>
         <source>Gas consumption (CCR legs excluded):</source>
         <translation>Gaz consumat (picioarele CCR au fost excluse):</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="820"/>
-        <source>Gas consumption:</source>
-        <translation>Gaz consumat</translation>
+        <location filename="../core/planner.c" line="844"/>
+        <source>Gas consumption (based on SAC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../core/planner.c" line="841"/>
+        <location filename="../core/planner.c" line="869"/>
         <source>this is more gas than available in the specified cylinder!</source>
         <translation>este necesar de mai mult gaz decât de cel disponibil in tub!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="846"/>
+        <location filename="../core/planner.c" line="875"/>
         <source>not enough reserve for gas sharing on ascent!</source>
         <translation>nu există rezerve de gaz ce pot fi împărțite la urcare!</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="848"/>
+        <location filename="../core/planner.c" line="877"/>
         <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
         <translation>%.0f%s/%.0f%s din %s (%.0f%s/%.0f%s plănuite pentru urcare)</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="850"/>
+        <location filename="../core/planner.c" line="879"/>
         <source>%.0f%s (%.0f%s during planned ascent) of %s</source>
         <translation>%.0f%s (%.0f%s în timpul urcării planificate) din %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="868"/>
+        <location filename="../core/planner.c" line="897"/>
         <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valoare pO₂ mare %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="878"/>
+        <location filename="../core/planner.c" line="907"/>
         <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
         <translation>valoare pO₂ mică %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1205"/>
+        <location filename="../core/planner.c" line="1234"/>
         <source>Can&apos;t find gas %s</source>
         <translation>Gazul %s nu a fost găsit</translation>
     </message>
     <message>
-        <location filename="../core/planner.c" line="1451"/>
+        <location filename="../core/planner.c" line="1480"/>
         <source>ean</source>
         <translation>ean</translation>
     </message>
@@ -9080,8 +9100,8 @@ EADD: %d%s
     </message>
     <message>
         <location filename="../core/save-html.c" line="509"/>
-        <location filename="../smtk-import/smartrak.c" line="251"/>
-        <location filename="../smtk-import/smartrak.c" line="321"/>
+        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="318"/>
         <source>Notes</source>
         <translation>Notițe</translation>
     </message>
@@ -9650,77 +9670,77 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
         <translation>Notițe</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Built</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>Sank</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="247"/>
+        <location filename="../smtk-import/smartrak.c" line="244"/>
         <source>SankTime</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Reason</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Nationality</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="248"/>
+        <location filename="../smtk-import/smartrak.c" line="245"/>
         <source>Shipyard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>ShipType</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Length</source>
-        <translation type="unfinished"/>
+        <translation>Lungime</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="249"/>
+        <location filename="../smtk-import/smartrak.c" line="246"/>
         <source>Beam</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Draught</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Displacement</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="250"/>
+        <location filename="../smtk-import/smartrak.c" line="247"/>
         <source>Cargo</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="263"/>
+        <location filename="../smtk-import/smartrak.c" line="260"/>
         <source>Wreck Data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Altitude</source>
         <translation>Altitudine</translation>
     </message>
     <message>
-        <location filename="../smtk-import/smartrak.c" line="320"/>
+        <location filename="../smtk-import/smartrak.c" line="317"/>
         <source>Depth</source>
         <translation>Adâncime</translation>
     </message>
@@ -9740,12 +9760,12 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="112"/>
         <source>Dive list</source>
-        <translation type="unfinished"/>
+        <translation>Lista scufundari</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="127"/>
         <source>Cloud credentials</source>
-        <translation type="unfinished"/>
+        <translation>Date de conectare la Cloud</translation>
     </message>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="141"/>
@@ -9845,7 +9865,7 @@ Este conectat corect dispozitivul Uemis Zurich?</translation>
     <message>
         <location filename="../mobile-widgets/qml/main.qml" line="318"/>
         <source>Actions</source>
-        <translation type="unfinished"/>
+        <translation>Actiuni</translation>
     </message>
 </context>
 <context>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index eab426f77..c7758c666 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -907,7 +907,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
         <source>Dive mode color</source>
-        <translation>Цвет режима</translation>
+        <translation>Цветовой режим</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
@@ -943,7 +943,7 @@
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
         <source>Reset Depth</source>
-        <translation>Сброс глубины</translation>
+        <translation>Глубина сброса</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
@@ -1398,7 +1398,7 @@
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1881"/>
         <source>Light</source>
-        <translation>Светлая</translation>
+        <translation>Подсветка</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1898"/>
@@ -3847,7 +3847,7 @@ p, li { white-space: pre-wrap; }
         <location filename="../desktop-widgets/maintab.cpp" line="539"/>
         <location filename="../desktop-widgets/maintab.cpp" line="571"/>
         <source>Notes</source>
-        <translation>Примечания</translation>
+        <translation>Основное</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/maintab.ui" line="21"/>
@@ -5223,7 +5223,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="147"/>
         <source>Default cylinder</source>
-        <translation>Баллон по умолчанию</translation>
+        <translation>Баллоны</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="162"/>
@@ -5243,7 +5243,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="215"/>
         <source>Clear all settings</source>
-        <translation>Очистить все натройки</translation>
+        <translation>Очистить все настройки</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_defaults.ui" line="227"/>
@@ -5489,7 +5489,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/>
         <source>Use UI language default</source>
-        <translation>Язык интерфейса по умолчанию</translation>
+        <translation>Из настроек языка интерфейса</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/>
@@ -5790,7 +5790,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="213"/>
         <source>Ascent/descent speed denominator</source>
-        <translation>Делитель скорости спуска/подъема</translation>
+        <translation>Cкорость спуска/подъема</translation>
     </message>
     <message>
         <location filename="../desktop-widgets/preferences/preferences_units.ui" line="220"/>
author	Dirk Hohndel <dirk@hohndel.org>	2017-02-16 23:06:43 -0800
committer	Dirk Hohndel <dirk@hohndel.org>	2017-02-16 23:06:43 -0800
commit	c5b9cfcaf655bd5af3bf57277b3591505d84e1cb (patch)
tree	8c56827f29399704a8caebf8a609a1d708ede420 /translations
parent	93763f31648f4d728620a401882de858e054d485 (diff)
download	subsurface-c5b9cfcaf655bd5af3bf57277b3591505d84e1cb.tar.gz