diff options
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/subsurface_cs.ts | 2328 | ||||
| -rw-r--r-- | translations/subsurface_en_GB.ts | 2565 | ||||
| -rw-r--r-- | translations/subsurface_fi_FI.ts | 2304 | ||||
| -rw-r--r-- | translations/subsurface_hr_HR.ts | 2453 | ||||
| -rw-r--r-- | translations/subsurface_hu.ts | 2268 | ||||
| -rw-r--r-- | translations/subsurface_id.ts | 2455 | ||||
| -rw-r--r-- | translations/subsurface_vi.ts | 2455 |
7 files changed, 8594 insertions, 8234 deletions
diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index d5dec8ad7..54042d273 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -2,25 +2,25 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> <translation>O programu Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> <translation>Mobilní verze svobodného potápěčského deníku Subsurface. </translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation>Prohlížejte své záznamy ponorů na cestách.</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team @@ -290,12 +290,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation>Osoba:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="627"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation>Hledání buddy a divemasterů</translation> </message> @@ -512,42 +512,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <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"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation>Nepodařilo se otevřít záložní soubor: %1</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation>Podrobnosti o potápěčském počítači úspěšně načteny</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation>Nastavení bylo úspěšně zapsáno do zařízení</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation>Firmware zařízení úspěšně aktualizován</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation>Základní nastavení zařízení úspěšně obnoveno</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation>Nelze inicializovat libdivecomputer</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation>Nelze zřídit spojení s potápěčským počítačem.</translation> </message> @@ -617,7 +617,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/> <source>Save libdivecomputer logfile</source> - <translation>Uložit soubor s logem libdivecomputer</translation> + <translation>Uložit soubor .log libdivecomputer</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/> @@ -853,6 +853,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation>Apnoe</translation> </message> @@ -970,7 +971,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> + <source>Always show pO₂</source> <translation>Vždy zobrazit pO₂</translation> </message> <message> @@ -1313,7 +1314,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> + <source>Max. depth</source> <translation>Největší hloubka</translation> </message> <message> @@ -1441,11 +1442,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation>Apnoea</translation> - </message> - <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1532,8 +1528,8 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> - <translation>Vyberte log soubor pro stahování z potápěčského počítače</translation> + <source>Choose file for dive computer download logfile</source> + <translation>Vyberte log soubor stahování z potápěčského počítače</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1228"/> @@ -1544,7 +1540,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation>Činnosti</translation> </message> @@ -1568,13 +1565,14 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation>Počáteční tlak</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>End press.</source> - <translation>Konečný tlak</translation> + <translation>Koncový tlak</translation> </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> @@ -1607,42 +1605,37 @@ <translation>Použít</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>kubická stopa (cuft)</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> - <translation> ℓ</translation> + <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknutím sem odeberete tuto lahev.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <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 '*' for best O₂% for max depth.</source> - <translation>Vypočteno s použitím nastavení pO₂ na dně. Nastavení MOD upravuje O₂ %, nastavení na '*' 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 '*' for best He% for max depth.</source> - <translation>Vypočteno s použitím nastavení nejlepší směsi END. Nastavení MND upravuje He %, nastavení na '*' pro nejlepší He % pro maximální hloubku.</translation> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> + <translation>Vypočteno s použitím nastavení pO₂ na dně. Nastavení MOD upravuje O₂ %, nastavte na '*' pro nejlepší O₂ % pro maximální hloubku.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> - <translation>Lahev nelze odebrat</translation> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> + <translation>Vypočteno s použitím nastavení Nejlepší směsi END. Nastavení MND upraví He % pro maximální hloubku.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tento plyn je používán. Lze odstranit jen ty lahve, jež nejsou použity při ponoru.</translation> </message> @@ -1755,22 +1748,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation>Podrobnosti ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation>Smazat ponor</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation>Zobrazit na mapě</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation>Více buddy</translation> </message> @@ -1778,94 +1771,94 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation>Ponor %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation>Lokalita:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation>Souřadnice:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation>Použít nynější GPS polohu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation>Hloubka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation>Trvání:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation>Zátěž:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation>Lahev:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation>Směs plynu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation>Počáteční tlak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation>Koncový tlak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> @@ -1873,72 +1866,72 @@ GPS polohu:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation>Hloubka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation>Doba trvání:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation>Žádný profil k zobrazení</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation>Podrobnosti ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation>Lahev:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation>Zátěž:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -2006,12 +1999,12 @@ GPS polohu:</translation> <translation>Seznam potápění</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation>Hloubka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation>Doba trvání:</translation> </message> @@ -2026,7 +2019,7 @@ GPS polohu:</translation> <translation>Pro přidání ponoru klikněte na tlačítko '+'</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation>Žádné ponory v seznamu</translation> </message> @@ -2116,7 +2109,7 @@ GPS polohu:</translation> <message> <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Load image from web</source> - <translation>Nahrání obrázek z webu</translation> + <translation>Nahrát obrázek z webu</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="974"/> @@ -2758,12 +2751,12 @@ GPS polohu:</translation> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation>%1 ponor(y)</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation>Více buddies</translation> </message> @@ -2809,32 +2802,32 @@ GPS polohu:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation>Koncová hloubka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation>Čas konce</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation>Použitý plyn</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -2852,12 +2845,17 @@ GPS polohu:</translation> <translation>Dostupné plyny</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="142"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation>Přidat lahev</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation>Přidat bod do dat ponoru</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="151"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="152"/> <source>Save new</source> <translation>Uložit nový</translation> </message> @@ -3063,11 +3061,6 @@ p, li { white-space: pre-wrap; } <translation>Délka</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation>Teplota</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation>Zátěž</translation> @@ -3079,10 +3072,15 @@ p, li { white-space: pre-wrap; } <translation>Oblek</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation>Teplota</translation> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> - <translation>Láhev</translation> + <source>Cylinder</source> + <translation>Lahev</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="460"/> @@ -3135,7 +3133,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation>Teplota (%1%2)</translation> </message> <message> @@ -3306,8 +3304,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> - <translation>Vyberte log soubor pro stahování z potápěčského počítače</translation> + <source>Choose file for dive computer download logfile</source> + <translation>Vyberte soubor .log stahování z potápěčského počítače</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> + <translation>Vyberte soubor pro binární dump potápěčského počítače</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/> @@ -3325,11 +3328,6 @@ p, li { white-space: pre-wrap; } <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 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>Dump soubory (*.bin)</translation> @@ -3378,7 +3376,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/> <source>Save libdivecomputer logfile</source> - <translation>Uložit libdivecomputer log soubor</translation> + <translation>Uložit soubor .log libdivecomputer</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/> @@ -3531,7 +3529,7 @@ p, li { white-space: pre-wrap; } <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>Pro připojení k Facebooku se prosím zalogujte. Tím umožníte Subsurface publikovat vaše ponory na vaší časové ose.</translation> + <translation>Pro připojení k Facebooku se, prosím, přihlašte. Tím Subsurface umožníte vaše ponory zveřejnit na vaší časové ose.</translation> </message> </context> <context> @@ -3608,12 +3606,12 @@ prosím odešlete následující vývojářům. <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Tato funkce ještě není pro vybraný potápěčský počítač dostupná.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation>Aktualizace firmware selhala!</translation> </message> @@ -3621,7 +3619,8 @@ prosím odešlete následující vývojářům. <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation>Zpět</translation> </message> @@ -3637,32 +3636,32 @@ prosím odešlete následující vývojářům. <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation>GPS pozice</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> <translation>Název:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation>Zeměpisná šířka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation>Zeměpisná délka:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation>Seznam uložených GPS pozic</translation> </message> @@ -3678,12 +3677,12 @@ prosím odešlete následující vývojářům. <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> <translation>&Zavřít</translation> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation>Zavřít zprávu</translation> </message> @@ -3691,7 +3690,7 @@ prosím odešlete následující vývojářům. <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="653"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation>Lokalita: </translation> </message> @@ -3837,8 +3836,8 @@ Jste si jisti, že chcete pokračovat?</translation> <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation>Aplikační log</translation> </message> @@ -3846,437 +3845,227 @@ Jste si jisti, že chcete pokračovat?</translation> <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> - <translation>Obecné poznámky o současném výběru</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> + <translation>Formulář</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation>Upravit potápěčskou lokalitu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Partner</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation>Viditelnost</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation>Štítky</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation>Režim potápění</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Výstroj</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <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>Informace</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation>Informace o ponoru</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation>Interval</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation>Použité plyny</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <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>SAC</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation>CNS</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation>OTU</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation>Největší hloubka</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation>Průměrná hloubka</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation>Tlak vzduchu</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation>Doba ponoru</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation>Salinita</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation>Statistiky</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation>Jednoduchá statistika současného výběru</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Hloubka</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> - <translation>Teplota</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> - <translation>Celkový čas</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> + <translation>Další údaje</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Ponory</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> + <translation>Informace</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> - <translation>Spotřeba plynu</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> + <translation>Statistiky</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> <source>Photos</source> <translation>Fotografie</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> - <translation>Všechny fotografie současného výběru</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation>Další data</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> - <translation>Dodatečná data z potápěčského počítače</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation>Použít změny</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation>Zahodit změny</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Lahve</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation>Přidat lahev</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation>Zátěž</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation>Přidat zátěž</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation>Freedive</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation>Teplota vzduchu [%1]</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation>Teplota vody [%1]</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation>Tento výlet je upravován.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation>Je upravováno více ponorů.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation>Tento ponor je upravován.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation>Poznámky k výletu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation>Lokalita výletu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation>/min</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation>Nejhlubší ponor</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <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á SAC ponoru</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation>Nejnižší celková SAC 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á SAC vybraných ponorů</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation>Nejvyšší teplota</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation>Nejnižší teplota</translation> - </message> - <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 ponorů</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation>Nejdelší ponor</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <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 ponorů</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation>Tyto plyny se dají namíchat -ze vzduchu a následujících plynů:</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation> a </translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation>Nová potápěčská lokalita</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation>Zahodit změny?</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation>Chystáte se zahodit změny.</translation> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <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>Opravdu chcete smazat všechny obrázky?</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation>Nahrát obrázek(y) ze souboru(ů)</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <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>Smazat vybrané obrázky</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation>Smazat všechny obrázky</translation> - </message> </context> <context> <name>MainWindow</name> @@ -4293,7 +4082,7 @@ ze vzduchu a následujících plynů:</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="104"/> <source>&View</source> - <translation>Zobrazit</translation> + <translation>&Pohled</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="120"/> @@ -4303,7 +4092,7 @@ ze vzduchu a následujících plynů:</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="129"/> <source>&Import</source> - <translation>&Import</translation> + <translation>&Nahrání</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="138"/> @@ -4332,7 +4121,7 @@ ze vzduchu a následujících plynů:</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation>Otevřít</translation> </message> @@ -4484,7 +4273,7 @@ ze vzduchu a následujících plynů:</translation> <message> <location filename="../desktop-widgets/mainwindow.ui" line="396"/> <source>&Import log files</source> - <translation>&Importovat log soubory</translation> + <translation>&Importovat soubory .log</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="399"/> @@ -4675,159 +4464,159 @@ ze vzduchu a následujících plynů:</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation>Připojit k</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <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="1571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation>Otevřít soubor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation>Procházet adresáře obrázků</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation>Prohledat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation>Prohledávání obrázků... (může trvat delší dobu)</translation> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation>Varování</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation>Vypsat tabulku koncových časů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <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="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Pokus o úpravu ponoru, který není ručně zadaným ponorem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chcete uložit změny provedené v souboru %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chcete uložit změny provedené v souboru s daty?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation>Uložit změny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation>Změny budou ztraceny, pokud je neuložíte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1598"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation>Uložit soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML soubory (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1696"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation>[místní vyrovnávací paměť pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation>[serverové úložiště pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation>Otevírání datového souboru ze starší verze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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>Otevřeli jste datový soubor starší verze Subsurface. Doporučujeme vám přečíst příručku, 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="1826"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation>Otevřít soubor potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1827"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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>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> + <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 prohlížeč (*.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="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation>Spojení se serverovou službou...</translation> </message> @@ -4835,7 +4624,7 @@ Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="738"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filtr zobrazuje %1 (z(e) %2) ponoru(ů)</translation> </message> @@ -4885,89 +4674,89 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation>Otevřený okruh</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation>Poslední zastávka ve 20 stopách</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation>50 % průměrné hloubky do 20 stop</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation>20 stop na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation> m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation>Poslední zastávka v 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="409"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation>50 % průměrné hloubky do 6 m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="410"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation>6 m na hladinu</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> - <translation> m</translation> + <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="414"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="415"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="423"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="424"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation> ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation>psi</translation> </message> @@ -5100,8 +4889,8 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> - <translation>Výchozí</translation> + <source>General</source> + <translation>Obecné</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> @@ -5171,134 +4960,155 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako <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>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>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>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>pO₂ ve výpočtu MOD (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> <source>CCR options:</source> <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>Výchozí setpoint (bar) plánovače ponorů</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> <source>Show setpoints when viewing pO₂</source> <translation>Zobrazit setpointy při zobrazení pO₂</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> <source>Show individual O₂ sensor values when viewing pO₂</source> <translation>Zobrazit individuální hodnoty senzoru O₂ při zobrazení pO₂</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> <source>Ceiling display setup</source> <translation>Nastavení zobrazení stropu</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> <source>Draw dive computer reported ceiling red</source> <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"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> <source>Algorithm for calculated ceiling:</source> <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>VPM-B</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> - <translation>VPM-B konzervatismus</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> - <translation>Bühlmann</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> - <translation>GFLow v největší hloubce</translation> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> + <translation>GFLow v maximální hloubce</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> <source>pSCR options:</source> <translation>pSCR možnosti:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> - <translation>Metabolická rychlost (ℓ O₂/min)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> <source>Dilution ratio</source> <translation>Poměr ředění</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> <source>1:</source> <translation>1:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> + <translation>Práh pro pO₂ (minimum, maximum)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> + <translation>Práh pro pN₂ (pouze maximum)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> + <translation>Práh pro pHe (pouze maximum)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> + <translation>pO₂ ve výpočtu MOD (pouze maximum)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> + <translation>Výchozí setpoint plánovače ponorů</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> + <translation>Úroveň konzervatismu</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> + <translation>B&ühlmann</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> + <translation> ℓ/min</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> + <translation>%</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> + <translation>Metabolická rychlost O₂</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> + <translation>&VPM-B</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation>Různé</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation>Zobrazit nepoužité lahve na kartě s výstrojí</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <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>Graf</translation> + <source>Profile</source> + <translation>Profil</translation> </message> </context> <context> @@ -5597,8 +5407,8 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> - <translation>cu ft</translation> + <source>cuft</source> + <translation>cuft</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> @@ -5679,17 +5489,17 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation>&Tisk</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation>&Náhled</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation>Tisk</translation> </message> @@ -5781,113 +5591,113 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Neznámý potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <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>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ěčský počítač</translation> - </message> - <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> <source>Add gas change</source> <translation>Přidat změnu plynu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> <source> (Tank %1)</source> <translation> (lahev %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> + <translation>První potápěčský počítač</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> + <translation>Smazat tento potápěčský počítač</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> <translation>Přidat změnu setpointu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Přidat záložku</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Editovat profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Odstranit událost</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Skrýt podobné události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Upravit název</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Upravit tlak v lahvi %1 (v současnosti interpolován jako %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation>Zrušit skrytí všech událostí</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation>Skrýt události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation>Skrýt všech %1 událostí?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation>Odstranit vybranou událost?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation>Upravit název záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation>Vlastní název:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation>Název je příliš dlouhý!</translation> </message> @@ -5900,96 +5710,96 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Spouštění...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation>režim práce bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation>žádné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation>Prosím zadejte platné přístupové údaje k serveru.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Pokus o otevření serverového úložiště s novými přístupovými údaji</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation>Zkoušení přístupových údajů k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>No response from cloud server to validate the credentials</source> <translation>Žádná odpověď cloudového serveru k ověření přístupových údajů</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Nelze se připojit k serverovému úložišti - serverový účet neověřen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation>Neplatné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Nelze otevřít cloudové úložiště: Chyba vytvoření https spojení</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation>Nelze otevřít serverové úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation>Nelze se připojit k serverovému úložišti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation>Chyba serverového úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Selhalo připojení ke cloudovému serveru, návrat ke stavu bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Serverové ú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"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation>Neznámá GPS pozice</translation> </message> @@ -6002,79 +5812,79 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Čekání na získání GPS pozice</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> - <translation> m</translation> + <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>VZDUCH</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <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"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation>KYSLÍK</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -6084,12 +5894,12 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>neznámo</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation>h:</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation>min</translation> </message> @@ -6142,8 +5952,8 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Tato funkce ještě není dostupná pro vybraný potápěčský počítač.</translation> </message> @@ -6185,7 +5995,7 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation>Resetování nastavení selhalo!</translation> </message> @@ -6202,13 +6012,13 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> - <translation>Přečíslovat</translation> + <source>Add setpoint change</source> + <translation>Přidat změnu setpointu</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> - <translation>Nový setpoint (0 pro otevřený sytém)</translation> + <source>New setpoint (0 for OC)</source> + <translation>Nový setpoint (0 pro otevřený sytém)</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="61"/> @@ -6399,54 +6209,54 @@ Ne všechny obrázky mají čas mezi <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation>Datum ponoru: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation>Doba trvání: %1 min </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation>h:</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation>Potápěčská lokalita %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation> @@ -6519,14 +6329,14 @@ Ne všechny obrázky mají čas mezi <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation>Prosím zadejte vaše přihlašovací údaje pro serverové úložiště Subsurface, abyste je mohli využívat se Subsurface-mobile. </translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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> @@ -6535,7 +6345,7 @@ Ne všechny obrázky mají čas mezi </translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <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> @@ -6548,22 +6358,22 @@ Ne všechny obrázky mají čas mezi <translation>O programu Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation>&Licence</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> <source>Credits</source> <translation>Zásluhy</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation>&Web</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="101"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation>&Zavřít</translation> </message> @@ -6624,7 +6434,7 @@ Ne všechny obrázky mají čas mezi <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="679"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation>Obleky:</translation> </message> @@ -6638,6 +6448,253 @@ Ne všechny obrázky mají čas mezi </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation>Další údaje</translation> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation>Informace</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation>Interval</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation>Použité plyny</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation>Spotřebovaný plyn</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation>CNS</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation>OTU</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation>Největší hloubka</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation>Průměrná hloubka</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation>Tlak vzduchu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation>Teplota vzduchu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation>Teplota vody</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation>Doba ponoru</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation>Salinita</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation>/min</translation> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation>Fotografie</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation>Nahrát obrázek(y) ze souboru(ů)</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation>Nahrát obrázek(y) z webu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation>Smazat vybrané obrázky</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation>Smazat všechny obrázky</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation>Mazání obrázků</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation>Opravdu chcete smazat všechny obrázky?</translation> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation>Statistiky</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>Hloubka</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Délka</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation>Teplota</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation>Celkový čas</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Ponory</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation>Spotřeba plynu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation>Nejvyšší celková SAC ponoru</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation>Nejnižší celková SAC ponorou</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation>Průměrná celková SAC vybraných ponorů</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation>Nejvyšší teplota</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation>Nejnižší teplota</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation>Průměrná teplota všech vybraných ponorů</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation>Nejhlubší ponor</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation>Nejmělčí ponor</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation>Nejdelší ponor</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation>Nejkratší ponor</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation>Průměrná délka všech vybraných ponorů</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation>/min</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation>Tyto plyny se dají namíchat +ze vzduchu a následujících plynů:</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation> a </translation> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6649,7 +6706,7 @@ Ne všechny obrázky mají čas mezi <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation>Štítky:</translation> </message> @@ -6763,87 +6820,92 @@ Ne všechny obrázky mají čas mezi <translation>Řádkování</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation>Šířka rámečku</translation> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation>Šablona</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation>Barvy</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation>Pozadí</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation>barva1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation>Upravit</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation>Buňky tabulky 1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation>barva2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation>Buňky tabulky 2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation>barva3</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation>Text 1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation>barva4</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation>Text 2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation>barva5</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation>Okraje</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation>barva6</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation>Chcete uložit vaše změny?</translation> </message> @@ -6851,62 +6913,62 @@ Ne všechny obrázky mají čas mezi <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation>Čas vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation>Hloubka vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation>Teplota vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation>pO₂ vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation>Čidlo 1 pO₂ vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation>Čidlo 2 pO₂ vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation>Čidlo 3 pO₂ vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation>CNS vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation>NDL vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation>TTS vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation>Hloubka zastavení vzorku</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation>Tlak vzorku</translation> </message> @@ -6914,7 +6976,7 @@ Ne všechny obrázky mají čas mezi <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="822"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation>%1klik k návštěvě %2</translation> </message> @@ -6957,7 +7019,7 @@ Ne všechny obrázky mají čas mezi <message> <location filename="../qt-models/divetripmodel.cpp" line="220"/> <source>m</source> - <translation> m</translation> + <translation>m</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="220"/> @@ -6971,10 +7033,20 @@ Ne všechny obrázky mají čas mezi </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation>Teplota (%1%2)</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation>Lahev</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> + <translation>Max. CNS</translation> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="229"/> <source>Weight(%1)</source> <translation>Hmotnost (%1)</translation> @@ -6995,11 +7067,6 @@ Ne všechny obrázky mají čas mezi <translation>Oblek</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation>Lahev</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation>Plyn</translation> @@ -7020,11 +7087,6 @@ Ne všechny obrázky mají čas mezi <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation>Max CNS</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation>Fotografie před/během/po ponoru</translation> @@ -7145,67 +7207,67 @@ Pokud nechcete, aby Subsurface pokračoval v kontrole, klikněte na Odmítnout.< <translation>Uživatelský průzkum</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation>Uživatelský průzkum Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation><html><head/><body><p>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.</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation>Technický potápěč</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation>Rekreační potápěč</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation>Plánovač ponorů</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation>Podporovaný potápěčský počítač</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation>Jiné programy/zdroje</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation>Ruční zadávání ponorů</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation>Android/iPhone companion aplikace</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation>Návrhy? (Anglicky)</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation>Budou odeslány i následující údaje o vašem systému.</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> - <translation>Jakým druhem potápěče jste?</translation> + <translation>Jaký druh potápěče jste?</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation>Odkud importujete data?</translation> </message> @@ -7389,15 +7451,15 @@ Jazyk: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <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"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation>Selhalo!</translation> </message> @@ -7414,7 +7476,7 @@ Jazyk: %1</translation> <message> <location filename="../qt-models/yearlystatisticsmodel.cpp" line="129"/> <source>#</source> - <translation>Číslo</translation> + <translation>Počet</translation> </message> <message> <location filename="../qt-models/yearlystatisticsmodel.cpp" line="132"/> @@ -7525,7 +7587,7 @@ Průměr</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation>Chyba při zpracování hlavičky</translation> </message> @@ -7533,277 +7595,281 @@ Průměr</translation> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> - <translation>dekompresní zastávka</translation> + <translation>Vyžadována dekomprese</translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> - <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation>výstup</translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation>baterie</translation> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation>největší hloubka</translation> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation>změna plynu</translation> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/datatrak.c" line="110"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <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/datatrak.c" line="114"/> - <location filename="../core/libdivecomputer.c" line="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/datatrak.c" line="118"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation>vysílač</translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation>Chyba: soubor se nezdá být DATATREK divelogem</translation> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation>jasno</translation> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation>mlhavo</translation> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation>mlha</translation> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation>déšť</translation> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation>bouře</translation> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation>sníh</translation> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation>Žádný oblek</translation> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation>Short</translation> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation>Kombinovaný</translation> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation>Mokrý oblek</translation> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation>Polosuchý oblek</translation> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation>Suchý oblek</translation> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation>bezzastávkový</translation> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation>dekomprese</translation> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation>jediný výstup</translation> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <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>sladká</translation> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation>Chyba: soubor se nezdá být potápěčským deníkem DATATRAK</translation> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation>sladká voda</translation> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation>slaná voda</translation> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation>prohlídka</translation> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation>klubový ponor</translation> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation>instruktor</translation> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation>instrukce</translation> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation>noční</translation> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation>jeskynní</translation> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation>pod led</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation>vyhledávací</translation> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation>vrakový</translation> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation>řeka</translation> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation>proudový</translation> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation>focení</translation> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation>jiné</translation> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation>Ostatní činnosti</translation> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation>Datatrak/Wlog poznámky</translation> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation>Ručně zadaný ponor</translation> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation>Neznámé</translation> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation>Chyba: nelze otevřít soubor %s</translation> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation>Chyba: žádný ponor</translation> </message> @@ -7864,9 +7930,9 @@ Průměr</translation> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1479"/> - <location filename="../core/planner.c" line="1482"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -7895,7 +7961,7 @@ Průměr</translation> <message> <location filename="../core/dive.c" line="227"/> <source>ℓ</source> - <translation> ℓ</translation> + <translation>ℓ</translation> </message> <message> <location filename="../core/dive.c" line="232"/> @@ -7903,93 +7969,93 @@ Průměr</translation> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> - <translation> m</translation> + <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation> m/min</translation> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation>stop/min</translation> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation>stop/s</translation> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation>libra US</translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) nebo (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1475"/> - <location filename="../core/planner.c" line="1478"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation>vzduch</translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation>integrovaný</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation>opasek</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation>kotník</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation>připínací</translation> </message> @@ -8061,276 +8127,276 @@ Průměr</translation> <translation>Kalibrace O₂</translation> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <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"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation>Nelze aktualizovat místní vyrovnávací paměť novějšími vzdálenými daty</translation> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation>Serverové úložiště Subsurface poškozeno</translation> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Nelze aktualizovat serverové úložiště Subsurface, zkuste to později</translation> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <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"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Vzdálené úložiště a místní data se rozcházejí. Nelze zkombinovat lokální a vzdálené změny</translation> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation>Vzdálené úložiště a lokální data se rozcházejí</translation> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <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"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problém s místní vyrovnávací pamětí servervého úložiště Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Data vyrovnávací paměti přesunuta do %s. Prosím zkuste operaci znovu.</translation> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Chyba připojení k serverovému úložišti Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation>git clone %s selhal (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3313"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>neznámý</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation>žádný</translation> </message> <message> - <location filename="../core/datatrak.c" line="116"/> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation>zátěž</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation>překročení</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation>záložka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation>hladina</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation>bezpečnostní zastávka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation>bezpečnostní zastávka (dobrovolná)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation>bezpečnostní zastávka (povinná)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation>strop (bezpečnostní zastávka)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> - <translation>pod stropem</translation> + <translation>Příliš hluboko</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation>trvání ponoru</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation>čas na vzduchu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation>směr</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation>varování nasycení tkání</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation>neplatné číslo události</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Chyba při zpracování data a času</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation>Ponor číslo %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Chyba zpracování data a času ponoru</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Chyba zpracování největší hloubky</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation>Chyba zpracování teploty</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Chyba zpracování počtu dýchacích plynů</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation>Chyba zpracování salinity vody</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation>Chyba zpracování tlaku na hladině</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> - <translation>Chyba zpracování režimu ponoru</translation> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> + <translation>Chyba při získávání potápěčského režimu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation>Chyba zpracování směsi plynu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation>Nelze vytvořit parser pro %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Chyba registrace dat</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation>Chyba zpracování vzorků</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation>Událost: Čekání na uživatelský vstup</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <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="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation>Chyba registrování ovladače události.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrování ovladače zrušení.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation>Chyba zavádění dat ponoru</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation>Potíže při inicializaci libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation>Nelze otevřít %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Nedostatečná oprávnění k otevření zařízení %s %s (%s)</translation> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <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"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation>dodatečný název lokality: %s @@ -8348,216 +8414,248 @@ Průměr</translation> <translation>Chyba - %s - zpracování ponoru %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation>Načtena divná procenta %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2047"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation>Nepodařilo se zpracovat '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3771"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation>Nelze otevřít styl %s</translation> </message> <message> - <location filename="../core/planner.c" line="561"/> + <location filename="../core/planner.c" line="567"/> <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>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="575"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Výpočet dekomprese přerušen pro příliš dlouhý čas</translation> </message> <message> - <location filename="../core/planner.c" line="577"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="877"/> - <location filename="../core/planner.c" line="903"/> - <location filename="../core/planner.c" line="913"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation>Varování:</translation> </message> <message> - <location filename="../core/planner.c" line="815"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation>, efektivně GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="589"/> - <source>Subsurface dive plan (surface interval </source> - <translation>Subsurface plán ponoru (povrchový interval</translation> - </message> - <message> - <location filename="../core/planner.c" line="320"/> + <location filename="../core/planner.c" line="324"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> <source>SP change</source> <translation>změna setpointu</translation> </message> <message> - <location filename="../core/planner.c" line="593"/> - <source>Subsurface dive plan</source> - <translation>Subsurface plán ponoru</translation> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> + <translation>VPM-B</translation> </message> <message> - <location filename="../core/planner.c" line="596"/> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> + <translation>BUHLMANN</translation> + </message> + <message> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation>Doba běhu: %dmin<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation>Hloubka</translation> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation>trvání</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation>plyn</translation> </message> <message> - <location filename="../core/planner.c" line="653"/> + <location filename="../core/planner.c" line="677"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <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="661"/> + <location filename="../core/planner.c" line="685"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Přechod do %.*f %s v %d:%02d min - runtime %d:%02u na %s</translation> </message> <message> - <location filename="../core/planner.c" line="674"/> + <location filename="../core/planner.c" line="698"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <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="681"/> + <location filename="../core/planner.c" line="705"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s</translation> </message> <message> - <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="729"/> - <location filename="../core/planner.c" line="733"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/planner.c" line="742"/> - <location filename="../core/planner.c" line="754"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="777"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Změna plynu na %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="779"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation>Změna plynu na %s</translation> </message> <message> - <location filename="../core/planner.c" line="799"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="801"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="806"/> - <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>Dekompresní model: Bühlmann ZHL-16C s GFlow = %d a GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="811"/> + <location filename="../core/planner.c" line="835"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekompresní model: VPM-B se jmenovitým konzervatismem</translation> </message> <message> - <location filename="../core/planner.c" line="813"/> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation>Subsurface</translation> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation>plán ponoru</b> (povrchový interval</translation> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> + <translation>vytvořeno</translation> + </message> + <message> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation>plán ponoru</b> vytvořeno</translation> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> + <translation>Dekompresní model: Bühlmann ZHL-16C s GFLow = %d%% a GFHigh = %d%%</translation> + </message> + <message> + <location filename="../core/planner.c" line="837"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekompresní model: VPM-B s konzervatismem +%d</translation> </message> <message> - <location filename="../core/planner.c" line="819"/> - <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>Dekompresní model: Rekreační mód založený na Bühlmann ZHL-16B s GFlow = %d a GFhigh = %d</translation> + <location filename="../core/planner.c" line="843"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> + <translation>Dekompresní model: Rekreační režim založený na Bühlmann ZHL-16B s GFLow = %d%% a GFHigh = %d%%</translation> </message> <message> - <location filename="../core/planner.c" line="827"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM tlak: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="845"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Spotřeba plynu (mimo CCR etapy):</translation> </message> <message> - <location filename="../core/planner.c" line="847"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation>Spotřeba plynu (založená na SAC</translation> </message> <message> - <location filename="../core/planner.c" line="872"/> + <location filename="../core/planner.c" line="899"/> <source>this is more gas than available in the specified cylinder!</source> <translation>to je více plynu než je dostupný v dané lahvi!</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="905"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>nedostatek záložního plynu pro sdílení při výstupu!</translation> </message> <message> - <location filename="../core/planner.c" line="880"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> - <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovaném výstupu)</translation> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation><br>&nbsp;&mdash; <span style='color: green;'>Minimum plynu</span> (založeno na %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="882"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> - <translation>%.0f%s (%.0f%s po dobu plánovaného výstupu) z %s</translation> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation>vyžadované minimum plynu pro výstup již překročilo počáteční tlak lahví!</translation> </message> <message> - <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> + <translation>%.0f%s/%.0f%s <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s při plánovaném výstupu)</translation> + </message> + <message> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s (%.0f%s během plánovaného výstupu) <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> + <location filename="../core/planner.c" line="964"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>vysoká pO₂ hodnota %.2f v %d:%02u se směsí %s v hloubce %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="910"/> + <location filename="../core/planner.c" line="976"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <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="1237"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation>Nelze najít směs %s</translation> </message> <message> - <location filename="../core/planner.c" line="1483"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation>ean</translation> </message> @@ -8652,31 +8750,31 @@ EADD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> - <translation>Bezpečnostní zastávka: %umin @ %.0f%s + <translation>Dekomprese: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> - <translation>Bezpečnostní zastávka: neznáma @ %.0f%s + <translation>Bezpečnostní zastávka: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> - <translation>Dekomprese: %umin @ %.0f%s + <translation>Bezpečnostní zastávka: neznámý čas @ %.0f%s </translation> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> - <translation>Dekomprese: Neznámý čas @ %.0f%s + <translation>Dekomprese: neznámý čas @ %.0f%s </translation> </message> <message> @@ -8704,7 +8802,7 @@ EADD: %d%s <location filename="../core/profile.c" line="1373"/> <source>Deco: %umin @ %.0f%s (calc) </source> - <translation>Dekomprese: %umin @ %.0f%s (spočítáno) + <translation>Dekomprese: %umin @ %.0f%s (vypočteno) </translation> </message> <message> @@ -8765,7 +8863,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> <translation>tepová frekvence: %d </translation> @@ -8781,7 +8879,7 @@ EADD: %d%s <location filename="../core/profile.c" line="1415"/> <source>mean depth to here %.1f%s </source> - <translation>střední hodnota hloubky posud %.1f%s + <translation>Střední hodnota hloubky %.1f%s </translation> </message> <message> @@ -8821,8 +8919,8 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> - <translation>%s SAC: %.*f %s</translation> + <source>%s SAC: %.*f%s</source> + <translation>%s SAC: %.*f%s</translation> </message> <message> <location filename="../core/qthelper.cpp" line="67"/> @@ -8879,281 +8977,286 @@ EADD: %d%s <translation>F</translation> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Nelze otevřít soubor %s</translation> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation>Číslo</translation> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Potápění</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation>Rozbalit vše</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation>Sbalit vše</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation>Výlety</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation>Statistiky</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation>Pokročilé hledání</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation>Hodnocení</translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation>Viditelnost</translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Partner</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation>Štítky</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation>Ukázat podrobnosti</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation>Rok</translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation>Celkový čas</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation>Průměrný čas</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation>Nejkratší čas</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation>Nejdelší čas</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation>Průměrná hloubka</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation>Nejmenší hloubka</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation>Největší hloubka</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation>Průměrná SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation>Nejmenší SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation>Největší SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation>Průměrná teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation>Nejmenší teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation>Největší teplota</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation>Zpět na seznam</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation>Číslo ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation>Profil ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation>Informace o ponoru</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation>Potápěčská výstroj</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation>Velikost</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation>Pracovní tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation>Počáteční tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation>Koncový tlak</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation>Plyn</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation>Zátěž</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation>Událost</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation>Název</translation> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation>Hodnota</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation>Souřadnice</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation>Status ponoru</translation> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation>Všechny (dle statistik výletu)</translation> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation>víc než %d dní</translation> @@ -9204,97 +9307,97 @@ EADD: %d%s <translation>(žádné ponory)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation>Ne</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation>Po</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation>Út</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation>St</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation>Čt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation>Pá</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation>So</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation>led</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation>úno</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation>bře</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation>dub</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation>kvě</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation>čer</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation>čec</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation>srp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation>zář</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation>říj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation>lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation>pro</translation> </message> @@ -9340,13 +9443,13 @@ Je Uemis Zurich správně zapojen?</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> - <translation>potápěčský deník #</translation> + <source>dive log #</source> + <translation>záznam ponoru #</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> - <translation>potápěčský příspěvek #</translation> + <source>dive spot #</source> + <translation>potápěčská lokalita #</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="499"/> @@ -9509,122 +9612,122 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Poplach: slabá baterie</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation>Čas:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation>Délka:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Největší hloubka:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation>Lokalita:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation>Vyrobeno</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation>Potopeno</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> <translation>Čas potopení</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation>Důvod</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation>Národnost</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation>Loděnice</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation>Typ lodě</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation>Délka</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation>Maximální šířka na čáře ponoru</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation>Ponor</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation>Výtlak</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation>Náklad</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation>Data vraku</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation>Nadmořská výška</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>Hloubka</translation> </message> @@ -9637,82 +9740,82 @@ Je Uemis Zurich správně zapojen?</translation> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> <translation>Seznam potápění</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation>Přístupové údaje ke cloudu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation>Spravovat ponory</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation>Ručně přidat ponor</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation>Ruční synchronizace s cloudem</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation>Offline režim</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation>Povolit automatickou synchronizaci se serverem</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation>GPS-tagovat ponory</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation>Nahrát GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Stáhnout GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation>Zobrazit GPS pozice</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation>Vyčistit GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation>Nastavení</translation> </message> @@ -9724,7 +9827,7 @@ Je Uemis Zurich správně zapojen?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="241"/> <source>App log</source> - <translation>Aplikační log</translation> + <translation>Aplikační záznam</translation> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="248"/> @@ -9742,20 +9845,15 @@ Je Uemis Zurich správně zapojen?</translation> <translation>O</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation>Spustit lokalizační službu</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation>Není dostupný žádný GPS zdroj</translation> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation>Činnosti</translation> - </message> </context> <context> <name>plannerDetails</name> @@ -9866,8 +9964,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation>bar</translation> </message> @@ -9888,22 +9986,13 @@ p, li { white-space: pre-wrap; } <translation>Přepínat pouze na vyžadovaných zastávkách</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation>GFLow</translation> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation>Plánovat vzduchové přestávky</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation>GFHigh</translation> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation>min</translation> </message> @@ -9943,88 +10032,123 @@ p, li { white-space: pre-wrap; } <translation>Úroveň konzervatismu</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation>+</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation>Nastavení směsi</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation> ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> - <translation> m</translation> + <translation>m</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation>SAC faktor</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation>Použito pro výpočet minima plynu. Zvažte dva ponory s případně zvýšeným SAS po události došel plyn.</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation>Čas řešení problému</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation>Použito k výpočtu minima plynu. Přidaný čas v maximální hloubce po události došel plyn.</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <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"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation>GFLow</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation>GFHigh</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation>SAC na dně</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation>pO₂ na dně</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation>Nejlepší směs END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Zobrazit v plánu ponoru časy konců zastávek (absolutní čas)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation>Zobrazit časy konců</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Zobrazit v plánu ponoru trvání zastávek (relativní čas)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation>Zobrazit trvání segmentu</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <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"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation>Zobrazit přechody v dekompresi</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation>Podrobný plán ponoru</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation>pO₂ při dekompresi</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation>SAC při dekompresi</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index c0e2f1e5c..70b10614e 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -2,25 +2,25 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> <translation>About Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> <translation>A mobile version of the free Subsurface divelog software. </translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation>View your dive logs while on the go.</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team @@ -290,12 +290,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="625"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation>Searches for buddies and divemasters</translation> </message> @@ -512,42 +512,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Could not save the backup file %1. Error Message: %2</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation>Could not open backup file: %1</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation>Dive computer details read successfully</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation>Setting successfully written to device</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation>Device firmware successfully updated</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation>Device settings successfully reset</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -853,6 +853,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation>Apnea</translation> </message> @@ -970,7 +971,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> + <source>Always show pO₂</source> <translation>Always show pO₂</translation> </message> <message> @@ -1313,8 +1314,8 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> - <translation>Max depth</translation> + <source>Max. depth</source> + <translation>Max. depth</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1743"/> @@ -1441,11 +1442,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation>Apnoea</translation> - </message> - <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1532,8 +1528,8 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> - <translation>Choose file for divecomputer download logfile</translation> + <source>Choose file for dive computer download logfile</source> + <translation>Choose logfile for dive computer download</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1228"/> @@ -1544,7 +1540,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation>Actions</translation> </message> @@ -1568,6 +1565,7 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation>Start press.</translation> </message> @@ -1607,42 +1605,37 @@ <translation>Use</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <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="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <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="250"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> - <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</translation> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="253"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> - <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</translation> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> + <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> - <translation>Cylinder cannot be removed</translation> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> + <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <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> @@ -1756,22 +1749,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation>Dive details</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation>Delete dive</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation>Show on map</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation>Multiple buddies</translation> </message> @@ -1779,94 +1772,94 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation>Dive %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation>Date:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation>Location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation>Coordinates:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation>Use current GPS location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation>Depth:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation>Duration:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> - <translation>Dive Master:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> + <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation>Start Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation>End Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation>Notes:</translation> </message> @@ -1874,72 +1867,72 @@ GPS location:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation>Date: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation>Depth: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation>Duration: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation>No profile to show</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation>Dive Details</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> - <translation>Dive Master:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> + <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -1947,18 +1940,23 @@ GPS location:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="165"/> + <location filename="../profile-widget/diveeventitem.cpp" line="155"/> + <source> (cyl. %1)</source> + <translation> (cyl. %1)</translation> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="169"/> <source>Manual switch to OC</source> <translation>Manual switch to OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="167"/> + <location filename="../profile-widget/diveeventitem.cpp" line="171"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="168"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -2002,12 +2000,12 @@ GPS location:</translation> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation>Depth: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation>Duration: </translation> </message> @@ -2022,7 +2020,7 @@ GPS location:</translation> <translation>Please tap the '+' button to add a dive</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation>No dives in dive list</translation> </message> @@ -2359,8 +2357,8 @@ GPS location:</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> - <source>Send the dive data to dive-share.appspot.com website</source> - <translation>Send the dive data to dive-share.appspot.com website</translation> + <source>Send the dive data to dive-share.appspot.com website.</source> + <translation>Send the dive data to dive-share.appspot.com website.</translation> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/> @@ -2754,12 +2752,12 @@ GPS location:</translation> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation>%1 dive(s)</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation>Multiple buddies</translation> </message> @@ -2805,32 +2803,32 @@ GPS location:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -2838,16 +2836,21 @@ GPS location:</translation> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="112"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="111"/> <source>Dive planner points</source> <translation>Dive planner points</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="115"/> <source>Available gases</source> <translation>Available gases</translation> </message> <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation>Add cylinder</translation> + </message> + <message> <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation>Add dive data point</translation> @@ -3059,11 +3062,6 @@ p, li { white-space: pre-wrap; } <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation>Temp</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation>Weight</translation> @@ -3075,10 +3073,15 @@ p, li { white-space: pre-wrap; } <translation>Suit</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation>Temp.</translation> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> - <translation>Cyl</translation> + <source>Cylinder</source> + <translation>Cylinder</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="460"/> @@ -3131,8 +3134,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> - <translation>Temp(%1%2)</translation> + <source>Temp.(%1%2)</source> + <translation>Temp.(%1%2)</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="500"/> @@ -3183,97 +3186,97 @@ p, li { white-space: pre-wrap; } <translation>failed to create zip file for upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>internal error</source> <translation>internal error</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="257"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Conversion of dive %1 to divelogs.de format failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="285"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>error writing zip file: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem with download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>The archive could not be opened: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3302,8 +3305,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> - <translation>Choose file for divecomputer download logfile</translation> + <source>Choose file for dive computer download logfile</source> + <translation>Choose logfile for dive computer download</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> + <translation>Choose file for dive computer binary dump</translation> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/> @@ -3321,11 +3329,6 @@ p, li { white-space: pre-wrap; } <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> - <source>Choose file for divecomputer binary dump file</source> - <translation>Choose file for divecomputer binary dump file</translation> - </message> - <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/> <source>Dump files (*.bin)</source> <translation>Dump files (*.bin)</translation> @@ -3439,8 +3442,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/> - <source> Vendor name : </source> - <translation> Vendor name : </translation> + <source> Vendor name: </source> + <translation> Vendor name: </translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="42"/> @@ -3516,7 +3519,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/> - <source>Connect to facebook text placeholder</source> + <source>Connect to Facebook text placeholder</source> <translation>Connect to Facebook text placeholder</translation> </message> <message> @@ -3604,12 +3607,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation>Firmware update failed.</translation> </message> @@ -3617,7 +3620,8 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation>Back</translation> </message> @@ -3633,32 +3637,32 @@ p, li { white-space: pre-wrap; } <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation>GPS Fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation>Date: </translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> <translation>Name: </translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation>Latitude: </translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation>Longitude: </translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation>List of stored GPS fixes</translation> </message> @@ -3674,12 +3678,12 @@ p, li { white-space: pre-wrap; } <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> <translation>&Close</translation> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation>Close message</translation> </message> @@ -3687,7 +3691,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="652"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation>Location: </translation> </message> @@ -3833,8 +3837,8 @@ p, li { white-space: pre-wrap; } <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation>Application Log</translation> </message> @@ -3842,438 +3846,227 @@ p, li { white-space: pre-wrap; } <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> - <translation>General notes about the current selection</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> + <translation>Form</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation>Edit dive site</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation>Visibility</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation>Dive mode</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Equipment</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <translation>Used equipment in the current selection</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> - <source>Info</source> - <translation>Info</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation>Dive information</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation>Interval</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation>Gases used</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <translation>Gas consumed</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> - <source>SAC</source> - <translation>SAC</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation>CNS</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation>OTU</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation>Max. depth</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation>Avg. depth</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation>Air pressure</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation>Dive time</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation>Salinity</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation>Stats</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation>Simple statistics about the selection</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> - <translation>Temperature</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> - <translation>Total time</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> + <translation>Extra Info</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Dives</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> + <translation>Information</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> - <translation>Gas consumption</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> + <translation>Statistics</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> - <translation>All photos from the current selection</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation>Extra data</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> - <translation>Adittional data from the dive computer</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation>Apply changes</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation>Discard changes</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation>Add cylinder</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation>Add weight system</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation>OC</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation>Freedive</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation>/min</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation>Deepest dive</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <translation>Shallowest dive</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> - <source>Highest total SAC of a dive</source> - <translation>Highest total SAC of a dive</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation>Lowest total SAC of a dive</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> - <source>Average total SAC of all selected dives</source> - <translation>Average total SAC of all selected dives</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation>Highest temperature</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation>Lowest temperature</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> - <source>Average temperature of all selected dives</source> - <translation>Average temperature of all selected dives</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation>Longest dive</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <translation>Shortest dive</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> - <source>Average length of all selected dives</source> - <translation>Average length of all selected dives</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation>These gases could be -mixed from Air and using: -</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation> and </translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <translation>Deleting Images</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Are you sure you want to delete all images?</source> - <translation>Are you sure you want to delete all images?</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation>Load image(s) from file(s)</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <translation>Load image(s) from web</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> - <source>Delete selected images</source> - <translation>Delete selected images</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation>Delete all images</translation> - </message> </context> <context> <name>MainWindow</name> @@ -4323,27 +4116,17 @@ mixed from Air and using: <translation>New</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> - <source>Ctrl+N</source> - <translation>Ctrl+N</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="168"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> - <source>Ctrl+O</source> - <translation>Ctrl+O</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="179"/> <source>&Save</source> <translation>&Save</translation> @@ -4354,11 +4137,6 @@ mixed from Air and using: <translation>Save</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> - <source>Ctrl+S</source> - <translation>Ctrl+S</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="190"/> <source>Sa&ve as</source> <translation>Sa&ve as</translation> @@ -4369,11 +4147,6 @@ mixed from Air and using: <translation>Save as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> - <source>Ctrl+Shift+S</source> - <translation>Ctrl+Shift+S</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="201"/> <source>&Close</source> <translation>&Close</translation> @@ -4384,61 +4157,31 @@ mixed from Air and using: <translation>Close</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> - <source>Ctrl+W</source> - <translation>Ctrl+W</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="212"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> - <source>Ctrl+P</source> - <translation>Ctrl+P</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="220"/> <source>P&references</source> <translation>P&references</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="223"/> - <source>Ctrl+,</source> - <translation>Ctrl+,</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="231"/> <source>&Quit</source> <translation>&Quit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="234"/> - <source>Ctrl+Q</source> - <translation>Ctrl+Q</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="242"/> <source>Import from &dive computer</source> <translation>Import from &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Ctrl+D</source> - <translation>Ctrl+D</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="250"/> <source>Import &GPS data from Subsurface web service</source> <translation>Import &GPS data from Subsurface web service</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> - <source>Ctrl+G</source> - <translation>Ctrl+G</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>Edit device &names</source> <translation>Edit device &names</translation> @@ -4449,11 +4192,6 @@ mixed from Air and using: <translation>&Add dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> - <source>Ctrl++</source> - <translation>Ctrl++</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Edit dive</source> <translation>&Edit dive</translation> @@ -4464,31 +4202,16 @@ mixed from Air and using: <translation>&Copy dive components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> - <source>Ctrl+C</source> - <translation>Ctrl+C</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="284"/> <source>&Paste dive components</source> <translation>&Paste dive components</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> - <source>Ctrl+V</source> - <translation>Ctrl+V</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="292"/> <source>&Renumber</source> <translation>&Renumber</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="295"/> - <source>Ctrl+R</source> - <translation>Ctrl+R</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>Auto &group</source> <translation>Auto &group</translation> @@ -4499,71 +4222,36 @@ mixed from Air and using: <translation>&Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> - <source>Ctrl+Y</source> - <translation>Ctrl+Y</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="316"/> <source>&Dive list</source> <translation>&Dive list</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> - <source>Ctrl+2</source> - <translation>Ctrl+2</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="324"/> <source>&Profile</source> <translation>&Profile</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> - <source>Ctrl+3</source> - <translation>Ctrl+3</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="332"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> - <source>Ctrl+4</source> - <translation>Ctrl+4</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="340"/> <source>&All</source> <translation>&All</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> - <source>Ctrl+1</source> - <translation>Ctrl+1</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="348"/> <source>P&revious DC</source> <translation>P&revious DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> - <source>Left</source> - <translation>Left</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="356"/> <source>&Next DC</source> <translation>&Next DC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> - <source>Right</source> - <translation>Right</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="364"/> <source>&About Subsurface</source> <translation>&About Subsurface</translation> @@ -4574,31 +4262,16 @@ mixed from Air and using: <translation>User &manual</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> - <source>F1</source> - <translation>F1</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Globe</source> <translation>&Globe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> - <source>Ctrl+5</source> - <translation>Ctrl+5</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> <source>P&lan dive</source> <translation>P&lan dive</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> - <source>Ctrl+L</source> - <translation>Ctrl+L</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="396"/> <source>&Import log files</source> <translation>&Import log files</translation> @@ -4609,11 +4282,6 @@ mixed from Air and using: <translation>Import divelog files from other applications</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> - <source>Ctrl+I</source> - <translation>Ctrl+I</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="407"/> <source>Import &from divelogs.de</source> <translation>Import &from divelogs.de</translation> @@ -4629,11 +4297,6 @@ mixed from Air and using: <translation>Toggle full screen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> - <source>F11</source> - <translation>F11</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="446"/> <source>&Check for updates</source> <translation>&Check for updates</translation> @@ -4649,21 +4312,11 @@ mixed from Air and using: <translation>Export dive logs</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="457"/> - <source>Ctrl+E</source> - <translation>Ctrl+E</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="462"/> <source>Configure &dive computer</source> <translation>Configure &dive computer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="465"/> - <source>Ctrl+Shift+C</source> - <translation>Ctrl+Shift+C</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="473"/> <source>Edit &dive in planner</source> <translation>Edit &dive in planner</translation> @@ -4754,11 +4407,6 @@ mixed from Air and using: <translation>&Filter divelist</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="676"/> - <source>Ctrl+F</source> - <translation>Ctrl+F</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="688"/> <source>Toggle tissue heat-map</source> <translation>Toggle tissue heat-map</translation> @@ -4775,22 +4423,12 @@ mixed from Air and using: <translation>&Undo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="701"/> - <source>Ctrl+Z</source> - <translation>Ctrl+Z</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> <location filename="../desktop-widgets/mainwindow.cpp" line="233"/> <source>&Redo</source> <translation>&Redo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> - <source>Ctrl+Shift+Z</source> - <translation>Ctrl+Shift+Z</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>&Find moved images</source> <translation>&Find moved images</translation> @@ -4827,159 +4465,159 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <translation>Disconnect from</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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <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> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation>Traverse image directories</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation>Scanning images...(this can take a while)</translation> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Please save or cancel the current dive edit before closing the file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <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="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Trying to edit a dive that's not a manually added dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <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="1264"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <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="1269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <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="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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="1817"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -4987,7 +4625,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="737"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter shows %1 (of %2) dives</translation> </message> @@ -5037,89 +4675,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation>Open circuit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="398"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="399"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="406"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="412"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="420"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="421"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation>psi</translation> </message> @@ -5252,8 +4890,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> - <translation>Defaults</translation> + <source>General</source> + <translation>General</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> @@ -5323,134 +4961,155 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Gas pressure display setup</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> - <source>Threshold for pO₂ (bar)</source> - <translation>Threshold for pO₂ (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> - <source>Threshold for pN₂ (bar)</source> - <translation>Threshold for pN₂ (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> - <source>Threshold for pHe (bar)</source> - <translation>Threshold for pHe (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> - <source>pO₂ in calculating MOD (bar)</source> - <translation>pO₂ in calculating MOD (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> <source>CCR options:</source> <translation>CCR options:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> - <source>Dive planner default setpoint (bar)</source> - <translation>Dive planner default setpoint (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> <source>Show setpoints when viewing pO₂</source> <translation>Show setpoints when viewing pO₂</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> <source>Show individual O₂ sensor values when viewing pO₂</source> <translation>Show individual O₂ sensor values when viewing pO₂</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> <source>Ceiling display setup</source> <translation>Ceiling display setup</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> <source>Draw dive computer reported ceiling red</source> <translation>Draw dive computer reported ceiling red</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> <source>Algorithm for calculated ceiling:</source> <translation>Algorithm for calculated ceiling:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> - <source>VPM-B</source> - <translation>VPM-B</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> - <translation>VPM-B Conservatism</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> - <translation>Bühlmann</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> - <translation>GFLow at max depth</translation> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> + <translation>GFLow at max. depth</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> <source>pSCR options:</source> <translation>pSCR options:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> - <translation>Metabolic rate (ℓ O₂/min)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> <source>Dilution ratio</source> <translation>Dilution ratio</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> <source>1:</source> <translation>1:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> + <translation>Threshold for pO₂ (minimum, maximum)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> + <translation>Threshold for pN₂ (maximum only)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> + <translation>Threshold for pHe (maximum only)</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> + <translation>pO₂ in calculating MOD (maximum only )</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> + <translation>Dive planner default setpoint</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> + <translation>Conservatism level</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> + <translation>B&ühlmann</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> + <translation>ℓ/min</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> + <translation>%</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> + <translation>Metabolic rate O₂</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> + <translation>&VPM-B</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation>Misc</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation>Show unused cylinders in Equipment tab</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <translation>Show mean depth in Profile</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> - <source>Graph</source> - <translation>Graph</translation> + <source>Profile</source> + <translation>Profile</translation> </message> </context> <context> @@ -5749,8 +5408,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> - <translation>cu ft</translation> + <source>cuft</source> + <translation>cuft</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> @@ -5831,17 +5490,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation>P&rint</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation>&Preview</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation>Print</translation> </message> @@ -5933,113 +5592,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <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="1359"/> - <source>Make first divecomputer</source> - <translation>Make first dive computer</translation> - </message> - <message> - <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="1375"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> - <translation>Add set-point change</translation> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> + <translation>Make default dive computer</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> + <translation>Delete this dive computer</translation> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> + <translation>Add setpoint change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <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="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -6052,96 +5711,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <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="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <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="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <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="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <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="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <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="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <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="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6154,79 +5813,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Waiting to aquire GPS location</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <translation><numerusform>(%n dive(s))</numerusform><numerusform>(%n dive(s))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation>OXYGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -6236,17 +5895,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>unknown</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation>h:</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="63"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="62"/> <source>Remove this point</source> <translation>Remove this point</translation> </message> @@ -6271,22 +5930,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> <source>Invalid response from server</source> <translation>Invalid response from server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="679"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Expected XML tag 'DiveDates' not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="686"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="698"/> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> @@ -6294,8 +5953,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> @@ -6337,7 +5996,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation>Reset settings failed</translation> </message> @@ -6354,13 +6013,13 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> - <translation>Renumber</translation> + <source>Add setpoint change</source> + <translation>Add setpoint change</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> - <translation>New set-point (0 for OC)</translation> + <source>New setpoint (0 for OC)</source> + <translation>New setpoint (0 for OC)</translation> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="61"/> @@ -6430,12 +6089,12 @@ Not all images have timestamps in the range between <translation>Which date and time are displayed on the image?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="302"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="303"/> <source>Open image file</source> <translation>Open image file</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="304"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="305"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -6551,54 +6210,54 @@ Not all images have timestamps in the range between <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation>Dive date: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation>Duration: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation>h:</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation>Dive location: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation> @@ -6671,14 +6330,14 @@ Not all images have timestamps in the range between <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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> @@ -6687,7 +6346,7 @@ Not all images have timestamps in the range between </translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <translation>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</translation> </message> @@ -6700,17 +6359,22 @@ Not all images have timestamps in the range between <translation>About Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation>&License</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> + <source>Credits</source> + <translation>Credits</translation> + </message> + <message> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation>&Website</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation>&Close</translation> </message> @@ -6723,47 +6387,47 @@ Not all images have timestamps in the range between <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="407"/> <source>Enter User ID and click Download</source> <translation>Enter User ID and click download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="429"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="505"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> <source>Connecting...</source> <translation>Connecting...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="524"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> <source>Download finished</source> <translation>Download finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="538"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> <source>Download error: %1</source> <translation>Download error: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="548"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> <source>Connection error: </source> <translation>Connection error: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> <source>Invalid user identifier!</source> <translation>Invalid user identifier.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <source>Cannot parse response!</source> <translation>Cannot parse response.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> <source>Download successful</source> <translation>Download successful</translation> </message> @@ -6771,7 +6435,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="678"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation>Suits: </translation> </message> @@ -6785,6 +6449,254 @@ Not all images have timestamps in the range between </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation>Extra Info</translation> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation>Information</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Date</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation>Interval</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation>Gases used</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation>Gas consumed</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation>CNS</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation>OTU</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation>Max. depth</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation>Avg. depth</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation>Air pressure</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation>Air temp.</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation>Water temp.</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation>Dive time</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation>Salinity</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation>/min</translation> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation>Photos</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation>Load image(s) from file(s)</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation>Load image(s) from web</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation>Delete selected images</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation>Delete all images</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation>Deleting Images</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation>Are you sure you want to delete all images?</translation> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation>Statistics</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>Depth</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Duration</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation>Temperature</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation>Total time</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Dives</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation>Gas consumption</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation>Highest total SAC of a dive</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation>Lowest total SAC of a dive</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation>Average total SAC of all selected dives</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation>Highest temperature</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation>Lowest temperature</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation>Average temperature of all selected dives</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation>Deepest dive</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation>Shallowest dive</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation>Longest dive</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation>Shortest dive</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation>Average length of all selected dives</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation>/min</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation>These gases could be +mixed from Air and using: +</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation> and </translation> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6796,7 +6708,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation>Tags: </translation> </message> @@ -6910,87 +6822,92 @@ Not all images have timestamps in the range between <translation>Line spacing</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation>Border width</translation> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation>Template</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation>Colours</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation>Background</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation>colour1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation>Edit</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation>Table cells 1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation>colour2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation>Table cells 2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation>colour3</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation>Text 1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation>colour4</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation>Text 2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation>colour5</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation>Borders</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation>colour6</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation>Do you want to save your changes?</translation> </message> @@ -6998,62 +6915,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation>Sample time</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation>Sample depth</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation>Sample temperature</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation>Sample pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation>Sample CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation>Sample NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation>Sample TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation>Sample stopdepth</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation>Sample pressure</translation> </message> @@ -7061,7 +6978,7 @@ Not all images have timestamps in the range between <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="821"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation>%1click to visit %2</translation> </message> @@ -7118,8 +7035,18 @@ Not all images have timestamps in the range between </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> - <translation>Temp(%1%2)</translation> + <source>Temp.(%1%2)</source> + <translation>Temp.(%1%2)</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation>Cylinder</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> + <translation>Max. CNS</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="229"/> @@ -7142,11 +7069,6 @@ Not all images have timestamps in the range between <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation>Cyl</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation>Gas</translation> @@ -7167,11 +7089,6 @@ Not all images have timestamps in the range between <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation>Max CNS</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> @@ -7250,9 +7167,9 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. - If you don't want Subsurface to continue checking, please click Decline.</source> - <translation>Subsurface is checking every two weeks if a new version is available. - If you don't want Subsurface to continue checking, please click Decline.</translation> +If you don't want Subsurface to continue checking, please click Decline.</source> + <translation>Subsurface checks every two weeks to see if a new version is available. +If you don't want Subsurface to continue checking, please click Decline.</translation> </message> <message> <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> @@ -7292,67 +7209,67 @@ Not all images have timestamps in the range between <translation>User survey</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation>Subsurface user survey</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation><html><head/><body><p>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.</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation>Technical diver</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation>Recreational diver</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation>Dive planner</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation>Supported dive computer</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation>Other software/sources</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation>Manually entering dives</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation>Android/iPhone companion app</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation>Any suggestions? (in English)</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation>The following information about your system will also be submitted.</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation>What kind of diver are you?</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation>Where are you importing data from?</translation> </message> @@ -7496,12 +7413,12 @@ Language: %1</translation> <translation>Upload</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="337"/> <source>Operation timed out</source> <translation>Operation timed out</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="358"/> <source>Transferring data...</source> <translation>Transferring data...</translation> </message> @@ -7536,15 +7453,15 @@ Language: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation>Failed!</translation> </message> @@ -7672,7 +7589,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation>Error parsing the header</translation> </message> @@ -7680,273 +7597,281 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation>deco stop</translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation>ascent</translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation>battery</translation> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <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="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <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="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <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="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation>transmitter</translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation>Error: the file does not appear to be a DATATRAK divelog</translation> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation>clear</translation> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation>misty</translation> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation>fog</translation> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation>rain</translation> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation>storm</translation> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation>snow</translation> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation>No suit</translation> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation>Shorty</translation> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation>Combi</translation> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation>Wet suit</translation> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation>Semi-dry suit</translation> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation>Dry suit</translation> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation>no stop</translation> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation>deco</translation> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation>single ascent</translation> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation>multiple ascent</translation> </message> <message> - <location filename="../core/datatrak.c" line="404"/> <location filename="../core/dive.c" line="27"/> <source>fresh</source> <translation>fresh</translation> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation>Error: the file does not appear to be a DATATRAK dive log</translation> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation>fresh water</translation> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation>salt water</translation> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation>sight seeing</translation> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation>club dive</translation> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation>instructor</translation> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation>instruction</translation> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation>night</translation> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation>cave</translation> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation>ice</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation>search</translation> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation>wreck</translation> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation>river</translation> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation>drift</translation> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation>photo</translation> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation>other</translation> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation>Other activities</translation> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation>Datatrak/Wlog notes</translation> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation>Manually entered dive</translation> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation>Unknown</translation> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation>Error: couldn't open the file %s</translation> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation>Error: no dive</translation> </message> @@ -8007,9 +7932,9 @@ Maximum</translation> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1476"/> - <location filename="../core/planner.c" line="1479"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8046,93 +7971,93 @@ Maximum</translation> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1472"/> - <location filename="../core/planner.c" line="1475"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation>integrated</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation>belt</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation>ankle</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> - <translation>backplate weight</translation> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> + <translation>backplate</translation> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8204,275 +8129,276 @@ Maximum</translation> <translation>O₂ calibration</translation> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation>Could not update local cache to newer remote data</translation> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface cloud storage corrupted</translation> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Could not update Subsurface cloud storage, try again later</translation> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Remote storage and local data diverged. Error: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Remote storage and local data diverged. Cannot combine local and remote changes</translation> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation>Remote storage and local data diverged</translation> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Remote storage and local data diverged. Error: writing the data failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problems with local cache of Subsurface cloud data</translation> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Moved cache data to %s. Please try the operation again.</translation> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Error connecting to Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3317"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation>none</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation>workload</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation>safety stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation>safety stop (recommended)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation>safety stop (mandatory)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation>deep stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation>ceiling (safety stop)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <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="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation>divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation>tissue level warning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation>invalid event number</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation>Error parsing temperature</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> - <translation>Error obtaining divemode</translation> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> + <translation>Error obtaining dive mode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <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="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <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="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Insufficient privileges to open the device %s %s (%s)</translation> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s </translation> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation>additional name for site: %s @@ -8490,210 +8416,248 @@ Maximum</translation> <translation>Error - %s - parsing dive %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2051"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3775"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> <message> - <location filename="../core/planner.c" line="558"/> + <location filename="../core/planner.c" line="567"/> <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>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.</translation> </message> <message> - <location filename="../core/planner.c" line="572"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Decompression calculation aborted due to excessive time</translation> </message> <message> - <location filename="../core/planner.c" line="574"/> - <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"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="586"/> - <source>Subsurface dive plan (surface interval </source> - <translation>Subsurface dive plan (surface interval </translation> + <location filename="../core/planner.c" line="324"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> + <source>SP change</source> + <translation>SP change</translation> + </message> + <message> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> + <translation>VPM-B</translation> </message> <message> - <location filename="../core/planner.c" line="590"/> - <source>Subsurface dive plan</source> - <translation>Subsurface dive plan</translation> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> + <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="598"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/planner.c" line="650"/> + <location filename="../core/planner.c" line="677"/> <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="658"/> + <location filename="../core/planner.c" line="685"/> <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="671"/> + <location filename="../core/planner.c" line="698"/> <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="678"/> + <location filename="../core/planner.c" line="705"/> <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="723"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="726"/> - <location filename="../core/planner.c" line="730"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/planner.c" line="739"/> - <location filename="../core/planner.c" line="751"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="774"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="776"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../core/planner.c" line="796"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="798"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <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"/> + <location filename="../core/planner.c" line="835"/> <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"/> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation>Subsurface</translation> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation>dive plan</b> (surface interval </translation> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> + <translation>created on</translation> + </message> + <message> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation>dive plan</b> created on</translation> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <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="837"/> <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> + <location filename="../core/planner.c" line="843"/> + <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"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Atm. pressure: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="842"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../core/planner.c" line="844"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation>Gas consumption (based on SAC</translation> </message> <message> - <location filename="../core/planner.c" line="869"/> + <location filename="../core/planner.c" line="899"/> <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="875"/> + <location filename="../core/planner.c" line="905"/> <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="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> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</translation> </message> <message> - <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> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation>required minimum gas for ascent already exceeds start pressure of cylinder.</translation> </message> <message> - <location filename="../core/planner.c" line="897"/> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> + <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</translation> + </message> + <message> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> + <translation>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></translation> + </message> + <message> + <location filename="../core/planner.c" line="964"/> <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="907"/> + <location filename="../core/planner.c" line="976"/> <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="1234"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1480"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation>ean</translation> </message> @@ -8788,31 +8752,31 @@ EADD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> - <translation>Safety Stop: %umin @ %.0f%s + <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> - <translation>Safety Stop: unkn time @ %.0f%s + <translation>Safety stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> - <translation>Deco: %umin @ %.0f%s + <translation>Safety stop: unknown time @ %.0f%s </translation> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> - <translation>Deco: unkn time @ %.0f%s + <translation>Deco: unknown time @ %.0f%s </translation> </message> <message> @@ -8901,9 +8865,9 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> - <translation>heartbeat: %d + <translation>heart rate: %d </translation> </message> <message> @@ -8957,8 +8921,8 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> - <translation>%s SAC:%.*f %s</translation> + <source>%s SAC: %.*f%s</source> + <translation>%s SAC: %.*f%s</translation> </message> <message> <location filename="../core/qthelper.cpp" line="67"/> @@ -9015,281 +8979,286 @@ EADD: %d%s <translation>F</translation> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation>Number</translation> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Dives</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation>Trips</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation>Statistics</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation>Advanced search</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation>Visibility</translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation>Show more details</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation>Year</translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation>Total time</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation>Average time</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation>Shortest time</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation>Longest time</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation>Average depth</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation>Min. depth</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation>Max. depth</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation>Average SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation>Min. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation>Max. SAC</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation>Average temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation>Min. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation>Max. temp.</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation>Back to list</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation>Dive No.</translation> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation>Dive profile</translation> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation>Dive information</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation>Dive equipment</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation>Size</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation>Work pressure</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation>Start pressure</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation>End pressure</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation>Events</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation>Name</translation> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation>Value</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation>Coordinates</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation>Dive status</translation> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation>All (by trip stats)</translation> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation>more than %d days</translation> @@ -9340,97 +9309,97 @@ EADD: %d%s <translation>(no dives)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -9476,13 +9445,13 @@ Is the Uemis Zurich plugged in correctly?</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> - <translation>divelog #</translation> + <source>dive log #</source> + <translation>dive log No.</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> - <translation>divespot #</translation> + <source>dive spot #</source> + <translation>dive spot No.</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="499"/> @@ -9645,205 +9614,210 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Low battery alert</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Date:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation>Time:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation>Duration:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. depth:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation>Air temp.:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation>Water temp.:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation>Location:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation>Sank</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> - <translation>SankTime</translation> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> + <translation>Sank Time</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation>Reason</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation>Nationality</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation>Length</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation>Draught</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation>Displacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation>Wreck Data</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>Depth</translation> </message> + <message> + <location filename="../profile-widget/diveprofileitem.cpp" line="196"/> + <source>planned waypoint above ceiling</source> + <translation>planned waypoint above ceiling</translation> + </message> </context> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation>Cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation>Manage dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation>Add dive manually</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation>Manual sync with cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation>Offline mode</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation>Enable auto cloud sync</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation>GPS-tag dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation>Upload GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Download GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation>Show GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation>Clear GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation>Preferences</translation> </message> @@ -9873,20 +9847,15 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>About</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation>Run location service</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation>No GPS source available</translation> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation>Actions</translation> - </message> </context> <context> <name>plannerDetails</name> @@ -9911,12 +9880,12 @@ Is the Uemis Zurich plugged in correctly?</translation> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></source> + </source> <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> + </translation> </message> </context> <context> @@ -9997,8 +9966,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation>bar</translation> </message> @@ -10019,22 +9988,13 @@ p, li { white-space: pre-wrap; } <translation>Only switch at required stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation>GF low</translation> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation>Plan backgas breaks</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation>GF high</translation> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation>min</translation> </message> @@ -10074,88 +10034,123 @@ p, li { white-space: pre-wrap; } <translation>Conservatism level</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation>+</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation>Gas options</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation>SAC factor</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation>Problem solving time</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation>Used to calculate minimum gas. Additional time at max. depth after OoG event.</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation>GFLow</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation>GFHigh</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation>Bottom SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation>Bottom pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation>Best mix END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>In dive plan, show runtime (absolute time) of stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation>Display runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>In dive plan, show duration (relative time) of stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation>Display segment duration</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>In dive plan, list transitions or treat them as implicit</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation>Display transitions in deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation>Verbatim dive plan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation>Deco pO₂</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation>Deco SAC</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index f189df190..c9bea5ca5 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -2,25 +2,25 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> <translation>Tietoja Subsurface mobiilista</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> <translation>Mobiili versio Subsurface -nimisestä sukelluslokiohjelmasta </translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation>Katsele sukelluslokiasi reissussa..</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team @@ -290,12 +290,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation>Henkilö:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="627"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation>Etsii sukelluskavereita ja divemastereita</translation> </message> @@ -512,42 +512,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Backup -tiedoston %1 tallennus epäonnistui. Virheviesti: %2</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation>Backup -tiedoston avaus epäonnistui: %1</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation>Sukellustietokoneen tiedot luettu onnistuneesti</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation>Asetuksen tallennus laitteeseen onnistui</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation>Laitteen ohjelmisto on päivitetty onnistuneesti</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation>Laitteen asetukset on palautettu onnistuneesti</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation>Yhteys sukellustietokoneeseen epäonnistui.</translation> </message> @@ -853,6 +853,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation>Vapaasukellus</translation> </message> @@ -970,8 +971,8 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> - <translation>Näytä aina ppO2</translation> + <source>Always show pO₂</source> + <translation>Näytä aina pO2</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/> @@ -1313,7 +1314,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> + <source>Max. depth</source> <translation>Suurin syvyys</translation> </message> <message> @@ -1441,11 +1442,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation>Apnea</translation> - </message> - <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1532,8 +1528,8 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> - <translation>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</translation> + <source>Choose file for dive computer download logfile</source> + <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1228"/> @@ -1544,7 +1540,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation>Tapahtumat</translation> </message> @@ -1568,6 +1565,7 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation>Alkupaine</translation> </message> @@ -1607,42 +1605,37 @@ <translation>Käyttö</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Clicking here will remove this cylinder.</source> <translation>Poista säiliö.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Dekokaasun vaihtosyvyys. Lasketaan käyttäen dekon pO₂ -asetusta, ellei arvoa ole asetettu käsin.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="250"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> - <translation>Lasketaan käyttäen pO₂:n pohja-asetusta. MOD:n muutos päivittää O₂%:a ja arvo '*' valitsee maksimisyvyyden mukaisen O₂%:n.</translation> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="253"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> - <translation>Lasketaan käyttäen parasta seosta END -asetuksen mukaan. MND:n muutos muuttaa He%:a ja arvo '*' valitsee maksimisyvyyden mukaisen He%:n.</translation> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> - <translation>Säiliötä ei voida poistaa</translation> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </message> @@ -1756,22 +1749,22 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation>Sukelluksen yksityiskohdat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation>Poista sukellus</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation>Näytä kartalla</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation>Useita sukelluspareja</translation> </message> @@ -1779,93 +1772,93 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation>Sukellus %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation>Päivä:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation>Kohde:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation>Koordinaatit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation>Käytä GPS -sijaintia:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation>Syvyys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation>Kesto:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation>Ilman lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation>Veden lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> - <translation>Sukellusvastaava:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> + <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation>Massa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation>Säiliö:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation>Kaasuseos:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation>Alkupaine:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation>Loppupaine:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> @@ -1873,72 +1866,72 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation>Päiväys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation>Syvyys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation>Kesto:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation>Ei näytettävää graafia</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation>Sukelluksen yksityiskohdat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation>Ilman lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation>Säiliö:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation>Veden lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> - <translation>Sukellusvastaava:</translation> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> + <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation>Massa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> @@ -2006,12 +1999,12 @@ GPS location:</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation>Syvyys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation>Kesto:</translation> </message> @@ -2026,7 +2019,7 @@ GPS location:</source> <translation>Napauta '+' -painiketta lisätäksesi sukelluksen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation>Ei sukelluksia lokissa</translation> </message> @@ -2758,12 +2751,12 @@ GPS location:</source> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation>%1 sukellusta</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation>Useita sukelluspareja</translation> </message> @@ -2809,32 +2802,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation>CC -asetuspiste</translation> </message> @@ -2852,12 +2845,17 @@ GPS location:</source> <translation>Mahdolliset kaasut</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="142"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation>Lisää säiliö</translation> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation>Lisää sukellusetappi</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="151"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="152"/> <source>Save new</source> <translation>Tallenna uusi</translation> </message> @@ -3063,11 +3061,6 @@ p, li { white-space: pre-wrap; } <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation>Lämpötila</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation>Painot</translation> @@ -3079,10 +3072,15 @@ p, li { white-space: pre-wrap; } <translation>Puku</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> - <translation>Säiliöt</translation> + <source>Cylinder</source> + <translation>Säiliö</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="460"/> @@ -3135,8 +3133,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> - <translation>Lämpötila(%1%2)</translation> + <source>Temp.(%1%2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="500"/> @@ -3306,8 +3304,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> - <translation>Valitse lokitiedosto sukellustietokoneen purun tietojen tallennukseen</translation> + <source>Choose file for dive computer download logfile</source> + <translation>Valitse lokitiedosto sukellustietokoneen tietojen tallennukseen</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/> @@ -3325,11 +3328,6 @@ p, li { white-space: pre-wrap; } <translation>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> - <source>Choose file for divecomputer binary dump file</source> - <translation>Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle</translation> - </message> - <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/> <source>Dump files (*.bin)</source> <translation>Raakatiedostot (*.bin)</translation> @@ -3608,12 +3606,12 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation>Laiteohjelmiston päivitys epäonnistui!</translation> </message> @@ -3621,7 +3619,8 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation>Takaisin</translation> </message> @@ -3637,32 +3636,32 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation>GPS sijainnit</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation>Päiväys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> <translation>Nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation>Leveyspiiri:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation>Pituuspiiri:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation>Tallennetut GPS sijainnit</translation> </message> @@ -3678,12 +3677,12 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> <translation>Sulje</translation> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation>Sulje viesti</translation> </message> @@ -3691,7 +3690,7 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="653"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation>Sijainti:</translation> </message> @@ -3836,8 +3835,8 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation>Sovellusloki</translation> </message> @@ -3845,438 +3844,227 @@ ole hyvä ja lähetä seuraava tieto kehittäjille. <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> - <translation>Yleisiä huomioita valinnasta</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> + <translation>Lomake</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Kello</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation>Ilman lämpötila</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation>Veden lämpötila</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation>Muokkaa sukelluskohdetta</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Sukelluspari</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation>Näkyvyys</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation>Sukellustyyppi</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Varusteet</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <translation>Valinnassa käytetyt laitteet</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> - <source>Info</source> - <translation>Tiedot</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation>Sukellustiedot</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation>Pinta-aika</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation>Käytetyt seokset</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <translation>Kaasun kulutus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> - <source>SAC</source> - <translation>Pintakulutus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation>Happikertymä (CNS)</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation>Happikertymä (OTU)</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation>Suurin syvyys</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation>Keskisyvyys</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation>Ilmanpaine</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation>Sukellusaika</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation>Suolapitoisuus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation>Tilastot</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation>Valinnan tilastot</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> - <translation>Lämpötila</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> - <translation>Kokonaisaika</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> + <translation>Lisätiedot</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Sukelluksia</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> + <translation>Tiedot</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> - <translation>Kaasun kulutus</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> + <translation>Tilastot</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> <source>Photos</source> <translation>Valokuvat</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> - <translation>Kaikki tämänhetkisen valinnan kuvat</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation>Lisätiedot</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> - <translation>Lisätietoja sukellustietokoneelta</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation>Hyväksy muutokset</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation>Hylkää muutokset</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation>Lisää säiliö</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation>Painot</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation>Lisää painojärjestelmä</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation>Vapaakierto</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation>Vapaasukellus</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation>Ilman lämpötila [%1]</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation>Veden lämpötila [%1]</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation>Tätä sukellusretkeä muokataan.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation>Muokataan useita sukelluksia.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation>Tätä sukellusta muokataan.</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation>Matkan muistiinpanot</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation>Matkakohde</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation>/min</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation>Syvin sukellus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <translation>Matalin sukellus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> - <source>Highest total SAC of a dive</source> - <translation>Korkein pintakulutus sukelluksella</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation>Matalin pintakulutus sukelluksella</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> - <source>Average total SAC of all selected dives</source> - <translation>Keskimääräinen pintakulutus valituilla sukelluksilla</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation>Korkein lämpötila</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation>Matalin lämpötila</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> - <source>Average temperature of all selected dives</source> - <translation>Valittujen sukellusten keskilämpötila</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation>Pisin sukellus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <translation>Lyhin sukellus</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> - <source>Average length of all selected dives</source> - <translation>Valittujen sukellusten keskimääräinen kesto</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation>Nämä kaasut voidaan -sekoittaa ilmasta ja käyttäen: -</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation>ja</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation>Uusi sukelluskohde</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation>Hylätäänkö muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation>Olet hylkäämässä muutoksesi.</translation> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <translation>Poistetaan kuvia</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Are you sure you want to delete all images?</source> - <translation>Haluatko varmasti poistaa kaikki kuvat?</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation>Lataa kuvia tiedostoista</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <translation>Lataa kuvia verkosta</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> - <source>Delete selected images</source> - <translation>Poista valitut kuvat</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation>Poista kaikki kuvat</translation> - </message> </context> <context> <name>MainWindow</name> @@ -4332,7 +4120,7 @@ sekoittaa ilmasta ja käyttäen: </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation>Avaa</translation> </message> @@ -4675,159 +4463,159 @@ sekoittaa ilmasta ja käyttäen: </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation>Yhdistä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <translation>Katkaise yhteys</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="1571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation>Hae kuvia alihakemistoista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation>Etsi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation>Kuvien etsintä käynnissä...(tämä voi kestää kauan)</translation> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Yrität muokata sukellusta, joka ei ole syötetty käsin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation>Muutokset hylätään, jos et tallenna niitä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1598"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1696"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation>[paikallinen cache] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation>[pilvitallennus] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation>Avataan vanhan tiedostomuodon loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti. Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1826"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1827"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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>Sukellusloki -tiedostot (*.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 -tiedostot (*.can *.CAN);;CSV -tiedostot (*.csv *.CSV);;DiveLog.de -tiedostot (*.dld *.DLD);;JDiveLog -tiedostot (*.jlb *.JLB);;Liquivision -tiedostot (*.lvd *.LVD);;MkVI -tiedostot (*.txt *.TXT);;Suunto -tiedostot (*.sde *.db *.SDE *.DB);;Divesoft -tiedostot (*.dlf *.DLF);;UDDF/UDCF -tiedostot (*.uddf *.udcf *.UDDF *.UDCF);;XML -tiedostot (*.xml *.XML);;APD log -tiedostot (*.apd *.APD);;Datatrak/WLog -tiedostot (*.log *.LOG);;OSTCtools -tiedostot (*.dive *.DIVE);;DAN DL7 -tiedostot (*.zxu *.zxl *.ZXU *.ZXL);;Kaikki tiedostot (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation>Otetaan yhteyttä pilvipalveluun...</translation> </message> @@ -4835,7 +4623,7 @@ Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa viel <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="738"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation>Suodin näyttää %1 (%2:sta) sukelluksesta</translation> </message> @@ -4885,89 +4673,89 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation>Avoin kierto</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation>Viimeinen pysähdys 20 jalassa</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation>50% keskisyvyydestä - 20 jalkaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation>20 jalasta pintaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation>Viimeinen pysähdys kuudessa metrissä</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="409"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation>50% keskisyvyydestä - 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="410"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation>6m:stä pintaan</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="414"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="415"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation>ft³/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="423"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="424"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation>psi</translation> </message> @@ -5100,8 +4888,8 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> - <translation>Oletukset</translation> + <source>General</source> + <translation>Yleistä</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> @@ -5171,134 +4959,155 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada <translation>Säiliöpaineen näytön asetukset</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> - <source>Threshold for pO₂ (bar)</source> - <translation>Kynnysarvo pO₂:lle (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> - <source>Threshold for pN₂ (bar)</source> - <translation>Kynnysarvo pN₂:lle (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> - <source>Threshold for pHe (bar)</source> - <translation>Kynnysarvo pHe:lle (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> - <source>pO₂ in calculating MOD (bar)</source> - <translation>pO₂ -arvo MOD:n laskentaan (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> <source>CCR options:</source> <translation>CCR -asetukset:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> - <source>Dive planner default setpoint (bar)</source> - <translation>Sukellussuunnitelman oletusetappipiste (bar)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> <source>Show setpoints when viewing pO₂</source> <translation>Näytä etappipisteet pO₂:ta tarkasteltaessa</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> <source>Show individual O₂ sensor values when viewing pO₂</source> <translation>Näytä yksittäisten O₂ -sensorien arvot pO₂:a katsottaessa</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> <source>Ceiling display setup</source> <translation>Kattosyvyyden näytön asetukset</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> <source>Draw dive computer reported ceiling red</source> <translation>Näytä sukellustietokoneen raportoima kattosyvyys punaisella</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> <source>Algorithm for calculated ceiling:</source> <translation>Kattosyvyyden laskenta-algoritmi:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> - <source>VPM-B</source> - <translation>VPM-B</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> - <translation>VPM-B:n konservatismi</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> - <translation>Bühlmann</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> <translation>GFLow maksimisyvyydessä</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> <source>pSCR options:</source> <translation>pSCR -asetukset:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> - <translation>Metabolinen nopeus (ℓ O₂/min)</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> <source>Dilution ratio</source> <translation>Laimennussuhde</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> <source>1:</source> <translation>1:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> + <translation>Konservatismi</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> + <translation>ℓ/min</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> + <translation>%</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation>Sekalaiset</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation>Näytä käyttämättömät säiliöt varusteluettelossa</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <translation>Näytä profiilissa keskisyvyys</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> - <source>Graph</source> - <translation>Kaavio</translation> + <source>Profile</source> + <translation>Profiilikuvaaja</translation> </message> </context> <context> @@ -5596,8 +5405,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> - <translation>kuutiojalka</translation> + <source>cuft</source> + <translation>ft³</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> @@ -5678,17 +5487,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation>Tulosta</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation>Esikatselu</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation>Tulosta</translation> </message> @@ -5780,113 +5589,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Tuntematon sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> - <source>Make first divecomputer</source> - <translation>Aseta ensisijaiseksi sukellustietokoneeksi</translation> - </message> - <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> - <source>Delete this divecomputer</source> - <translation>Poista tämä sukellustietokone</translation> - </message> - <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> <source> (Tank %1)</source> <translation>(Säiliö %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> - <translation>Aseta setpointin vaihto</translation> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> + <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Muokkaa profiilia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Muuta säiliön %1 painetta (tällä hetkellä %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -5899,96 +5708,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation>käytä off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation>Ei pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation>Syötä pilvipalvelun tunnuksent.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Yritetään avata yhteyttä pilvipalveluun uusilla tunnuksilla</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation>Testataan pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>No response from cloud server to validate the credentials</source> <translation>Käyttäjätunnusta ei voitu vahvistaa, koska pilvipalvelin ei vastaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Yhteys pilvipalveluun epäonnistui - käyttäjätunnusta ei voida vahvistaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation>Virheelliset pilvipalvelun tunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Yhteys pivlipalveluun epäonnistui: Virhe luotaessa HTTPS -yhteyttä</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation>Yhteys pilvitallennukseen epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation>Virhe pilvitallennuksessa: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation>Tuntemattomat GPS -sijainnit</translation> </message> @@ -6001,79 +5810,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Odotetaan GPS -sijaintia</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>Ilma</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <translation><numerusform>(%n sukellus)</numerusform><numerusform>(%n sukelluksia)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation>HAPPI</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -6083,12 +5892,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>tuntematon</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation>t:</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation>min</translation> </message> @@ -6141,8 +5950,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> @@ -6184,7 +5993,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation>Asetusten nollaus epäonnistui!</translation> </message> @@ -6201,13 +6010,13 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> - <translation>Numeroi uudelleen</translation> + <source>Add setpoint change</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> - <translation>Uusi setpoint (0 vappaalle kierrolle)</translation> + <source>New setpoint (0 for OC)</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="61"/> @@ -6397,54 +6206,54 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation>Sukelluspäivä: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation>Kesto: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation>t:</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation>Sukelluskohde: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation>Sukelluspari: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation> @@ -6517,14 +6326,14 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation>Syötä käyttäjätunnuksesi käyttääksesi Subsurface-mobiilia pilvipalvelun kanssa. </translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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> @@ -6533,7 +6342,7 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu </translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <translation>Käyttääksesi Subsurface-mobiilia paikallisesti, napauta alta "ei pilveä" -ikonia.</translation> </message> @@ -6546,22 +6355,22 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <translation>Tietoja Subsurfacesta</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation>Lisenssi</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> <source>Credits</source> <translation>Krediitit</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation>Websivu</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="101"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation>Sulje</translation> </message> @@ -6622,7 +6431,7 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="679"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation>Puvut:</translation> </message> @@ -6636,6 +6445,254 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation>Lisätiedot</translation> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation>Tiedot</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Ajankohta</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation>Pinta-aika</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation>Käytetyt seokset</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation>Kaasun kulutus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation>Pintakulutus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation>Happikertymä (CNS)</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation>Happikertymä (OTU)</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation>Suurin syvyys</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation>Keskisyvyys</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation>Ilmanpaine</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation>Ilman lämpötila</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation>Veden lämpötila</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation>Sukellusaika</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation>Suolapitoisuus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation>/min</translation> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation>Valokuvat</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation>Lataa kuvia tiedostoista</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation>Lataa kuvia verkosta</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation>Poista valitut kuvat</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation>Poista kaikki kuvat</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation>Poistetaan kuvia</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation>Haluatko varmasti poistaa kaikki kuvat?</translation> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation>Tilastot</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>Syvyys</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Kesto</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation>Lämpötila</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation>Kokonaisaika</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Sukelluksia</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation>Pintakulutus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation>Kaasun kulutus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation>Korkein pintakulutus sukelluksella</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation>Matalin pintakulutus sukelluksella</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation>Keskimääräinen pintakulutus valituilla sukelluksilla</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation>Korkein lämpötila</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation>Matalin lämpötila</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation>Valittujen sukellusten keskilämpötila</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation>Syvin sukellus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation>Matalin sukellus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation>Pisin sukellus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation>Lyhin sukellus</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation>Valittujen sukellusten keskimääräinen kesto</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation>/min</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation>Nämä kaasut voidaan +sekoittaa ilmasta ja käyttäen: +</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation>ja</translation> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6647,7 +6704,7 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation>Avainsanat:</translation> </message> @@ -6761,87 +6818,92 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <translation>Riviväli</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation>Sapluuna</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation>Värit</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation>Tausta</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation>väri1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation>Muuta</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation>Taulukon solu 1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation>väri2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation>Taulukon solu 2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation>väri3</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation>Teksti 1</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation>väri4</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation>Teksti 2</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation>väri5</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation>Reunukset</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation>väri6</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation>Haluatko tallentaa muutokset?</translation> </message> @@ -6849,62 +6911,62 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation>Näytteen aika</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation>Näytteen syvyys</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation>Näytteen lämpötila</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation>Näytteen </translation> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation>Näytesensori1 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation>Näytesensori2 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation>Näytesensori3 pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation>Näytteen CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation>Näytteen NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation>Näytteen TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation>Näytteen pysähdyssyvyys</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation>Näytteen säiliöpaine</translation> </message> @@ -6912,7 +6974,7 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="822"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation>napauta %1 pohjassa avataksesi %2</translation> </message> @@ -6969,8 +7031,18 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> - <translation>Lämpötila(%1%2)</translation> + <source>Temp.(%1%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation>Säiliö</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> + <translation>Max. CNS</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="229"/> @@ -6993,11 +7065,6 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <translation>Puku</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation>Säiliöt</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation>Kaasu</translation> @@ -7018,11 +7085,6 @@ Osa kuvien aikaleimasta ei ole minkään valitun sukelluksen aikana (+- 30 minuu <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation>Max CNS</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation>Kuvat sukelluksen aikana tai ennen/jälkeen</translation> @@ -7143,67 +7205,67 @@ Mikäli et halua tarkistusta tehtävän, valitse kieltävä painike.</translatio <translation>Käyttäjäkysely</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation>Subsurfacen käyttäjäkysely</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation><html><head/><body><p>Haluaisimme tietää enemmän käyttäjistämme, heidän asetuksistaan ja tyypillisestä Subsurfacen käytöstä. Voisitko täyttää tämän lomakkeen ja lähettää sen Subsurfacen kehittäjille.</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation>Tekniikkasukeltaja</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation>Harrastesukeltaja</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation>Sukellussuunnittelija</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation>Tuettu sukellustietokone</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation>Muut ohjelmat/lähteet</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation>Sukellusten syöttö käsin</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation>Android/iPhone apusovellus</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation>Kehitysideoita? (Mielellään englanniksi)</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation>Järjestelmästäsi lähetetään myös seuraavat tiedot.</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation>Millainen sukeltaja olet?</translation> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation>Mistä tuot tietoja?</translation> </message> @@ -7387,15 +7449,15 @@ Kieli: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>Ominaisuus ei ole vielä saatavilla valitulle sukellustietokoneelle.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation>Epäonnistui!</translation> </message> @@ -7523,7 +7585,7 @@ Keski</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation>Virhe otsaketietojen tulkinnassa</translation> </message> @@ -7531,277 +7593,281 @@ Keski</translation> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation>deko-pysähdys</translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> - <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation>nousu</translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation>paristo</translation> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation>Happikertymä</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation>Suurin syvyys</translation> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation>Kaasun vaihto</translation> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/datatrak.c" line="110"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>rbt</source> <translation>pohja-aika</translation> </message> <message> - <location filename="../core/cochran.c" line="379"/> - <location filename="../core/cochran.c" line="426"/> - <location filename="../core/datatrak.c" line="114"/> - <location filename="../core/libdivecomputer.c" line="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation>katto</translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/datatrak.c" line="118"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation>lähetin</translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation>Virhe: tiedosto ei vaikuta DTATRAK -sukelluslokilta</translation> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation>tyhjennä</translation> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation>sumuinen</translation> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation>sumu</translation> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation>sade</translation> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation>myrsky</translation> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation>lumi</translation> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation>Ei pukua</translation> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation>lyhyt</translation> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation>yhdistelmä</translation> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation>Märkäpuku</translation> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation>Puolikuiva</translation> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation>Kuivapuku</translation> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation>ilman pysähdystä</translation> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation>deko</translation> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation>yksittäinen nousu</translation> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation>useita nousuja</translation> </message> <message> - <location filename="../core/datatrak.c" line="404"/> <location filename="../core/dive.c" line="27"/> <source>fresh</source> <translation>makea</translation> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation>suolavesi</translation> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation>nähtävyydet</translation> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation>seurasukellus</translation> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation>kouluttaja</translation> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation>opastus</translation> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation>yö</translation> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation>luola</translation> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation>jää</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation>etsi</translation> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation>hylky</translation> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation>joki</translation> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation>virta</translation> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation>valokuva</translation> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation>muu</translation> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation>Muut aktiviteetit</translation> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation>Datatrak/Wlog -muistiinpanot</translation> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation>Käsin syötetty sukellus</translation> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation>Tuntematon</translation> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation>Virhe: tiedoston %s avaus ei onnistunut</translation> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation>Virhe: ei sukellusta</translation> </message> @@ -7862,9 +7928,9 @@ Keski</translation> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1479"/> - <location filename="../core/planner.c" line="1482"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation>happi</translation> </message> @@ -7901,93 +7967,93 @@ Keski</translation> <translation>ft³</translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) tai (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1475"/> - <location filename="../core/planner.c" line="1478"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation>ilma</translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation>integroitu</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation>vyöpaino</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation>nilkkapaino</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> - <translation>selkäpaino</translation> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8059,276 +8125,276 @@ Keski</translation> <translation>Happikalibrointi</translation> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Paikallinen välimuistihakemisto %s on korruptoitunut - synkronointi Subsurfacen pilvitallennustilaan ei onnistu</translation> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation>Paikallisen kopion päivitys uudempaan etäversioon epäonnistui</translation> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation>Virhe: Subsurfacen pilvitallennustila on korruptoitunut</translation> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Virhe: Subsurfacen pilvitallennustilan päivitys epäonnistui, yritä myöhemmin uudelleen</translation> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Etä- ja paikallinen tallennus eroavat toisistaan. Error: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Virhe: paikallinen- ja pilvitadata eroavat toisistaan. Emme voi yhdistää näitä keskenään</translation> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation>Virhe: paikallinen ja pilvidata eroavat toisistaan</translation> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Paikallinen ja pilvidata eroavat toisistaan. Virhe: tiedon tallennus epäonnistui (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Virhe: ongelmia paikallisen pilvidatan kopion kanssa</translation> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Paikallinen kopio siirretty %s. Ole hyvä ja yritä toimintoa uudelleen.</translation> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Virhe: yhteys Subsurfacen pilvitallennustilaan</translation> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation>lokin %s haku epäonnistui (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3313"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation>ei mitään</translation> </message> <message> - <location filename="../core/datatrak.c" line="116"/> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation>työmäärä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation>rike</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation>kirjanmerkki</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation>pinta</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation>turvapysähdys</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation>turvapysähdys (vapaaehtoinen)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation>turvapysähdys (pakollinen)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation>syväpysähdys</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation>katto (turvapysähdys)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>liian syvällä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation>Ilma-aika</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation>suunta</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation>kudoskertymän varoitus</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation>tuntematon tapahtumanumero</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation>Sukellus %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation>Virhe lämpötilan jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Virhe kaasuseosten määrän jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> - <translation>Virhe sukellustyypin lataamisessa</translation> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation>Jäsentäjän luominen %s %s epäonnistui</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Käyttövaltuudet eivät riitä laitteen %s %s (%s) avaamiseen</translation> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>sukelluskohteella on useita GPS -positioita; %s </translation> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation>Ylimääräinen nimi sukelluskohteelle: %s @@ -8346,217 +8412,249 @@ Keski</translation> <translation>Virhe - %s - jäsentäessä sukellusta %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation>Outo prosenttiosuus: %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2047"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation>Tiedoston '%s' lukeminen epäonnistui.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3771"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </message> <message> - <location filename="../core/planner.c" line="561"/> + <location filename="../core/planner.c" line="567"/> <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>VAROITUS: TÄMÄ ON UUSI TOTEUTUS %s ALGORITMISTA JA SUKELLUSTEN SUUNNITTELUOMINAISUUDESTA. TESTAUS EI OLE OLLUT RIITTÄVÄN KATTAVAA, JOTEN SUOSITAMME, ETTÄ ETTE SUKELLA VAIN NÄIDEN TULOSTEN PERUSTEELLA.</translation> </message> <message> - <location filename="../core/planner.c" line="575"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Dekon laskeminen on keskeytetty kohtuuttoman keston vuoksi</translation> </message> <message> - <location filename="../core/planner.c" line="577"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="877"/> - <location filename="../core/planner.c" line="903"/> - <location filename="../core/planner.c" line="913"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> <message> - <location filename="../core/planner.c" line="815"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation>, efektiivinen GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="589"/> - <source>Subsurface dive plan (surface interval </source> - <translation>Subsurface -sukellussuunnitelma (pinta-aika </translation> - </message> - <message> - <location filename="../core/planner.c" line="320"/> + <location filename="../core/planner.c" line="324"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> <source>SP change</source> <translation>SP:n mutos</translation> </message> <message> - <location filename="../core/planner.c" line="593"/> - <source>Subsurface dive plan</source> - <translation>Subsurfacen sukellussuunnitelma</translation> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> + <translation>VPM-B</translation> + </message> + <message> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="596"/> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation>Kesto: %dmin<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation>syvyys</translation> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation>kesto</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation>kaasu</translation> </message> <message> - <location filename="../core/planner.c" line="653"/> + <location filename="../core/planner.c" line="677"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="661"/> + <location filename="../core/planner.c" line="685"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation> </message> <message> - <location filename="../core/planner.c" line="674"/> + <location filename="../core/planner.c" line="698"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Pysy syvyydessä %.*f %s %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="681"/> + <location filename="../core/planner.c" line="705"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation> </message> <message> - <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="729"/> - <location filename="../core/planner.c" line="733"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation>%3d min</translation> </message> <message> - <location filename="../core/planner.c" line="742"/> - <location filename="../core/planner.c" line="754"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="777"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/planner.c" line="779"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../core/planner.c" line="799"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../core/planner.c" line="801"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../core/planner.c" line="806"/> - <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>Dekomalli: Bühlmann ZHL-16C käyttäen GFlow = %d ja GFhigh = %d -arvoja</translation> - </message> - <message> - <location filename="../core/planner.c" line="811"/> + <location filename="../core/planner.c" line="835"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomalli: VPM-B nimelliskonservatismilla</translation> </message> <message> - <location filename="../core/planner.c" line="813"/> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation>Subsurface</translation> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <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="837"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekomalli: VPM-B +%d konservatismilla</translation> </message> <message> - <location filename="../core/planner.c" line="819"/> - <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>Dekomalli: Harrastemalli perustuen Bühlmann ZHL-16B algoritmiin GFlow = %d ja GFhigh = %d -arvoilla</translation> + <location filename="../core/planner.c" line="843"/> + <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="827"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Ilmanpaine: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="845"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation> </message> <message> - <location filename="../core/planner.c" line="847"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation>Ilmankulutus (perustuen SAC:iin</translation> </message> <message> - <location filename="../core/planner.c" line="872"/> + <location filename="../core/planner.c" line="899"/> <source>this is more gas than available in the specified cylinder!</source> <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="905"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation> </message> <message> - <location filename="../core/planner.c" line="880"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> - <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="882"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> - <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="964"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="910"/> + <location filename="../core/planner.c" line="976"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1237"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../core/planner.c" line="1483"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation>ean</translation> </message> @@ -8651,32 +8749,29 @@ EADD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> - <translation>Turvapysähdys: %umin @ %.0f%s + <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> - <translation>Turvapysähdys: ajankohta? @ %.0f%s -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> - <translation>Deko: %umin @ %.0f%s -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> - <translation>Deko: ajankohta? @ %.0f%s -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1365"/> @@ -8763,10 +8858,9 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> - <translation>syke: %d -</translation> + <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1412"/> @@ -8819,8 +8913,8 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> - <translation>%s SAC:%.*f %s</translation> + <source>%s SAC: %.*f%s</source> + <translation type="unfinished"/> </message> <message> <location filename="../core/qthelper.cpp" line="67"/> @@ -8877,281 +8971,286 @@ EADD: %d%s <translation>F</translation> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Tiedoston avaus ei onnistu %s</translation> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation>Numero</translation> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Kello</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation>Ilman lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation>Veden lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Sukelluksia</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation>Retkiä</translation> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation>Tilastot</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation>Laajennettu haku</translation> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation>Näkyvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Sukellusvanhin</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Sukelluspari</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation>Avainsanat</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation>Näytä lisää yksityiskohtia</translation> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation>Vuosi</translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation>Kokonaisaika</translation> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation>Keskimääräinen kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation>Lyhin kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation>Pisin kesto</translation> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation>Keskisyvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation>Pienin syvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation>Suurin syvyys</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation>Pienin pintakulutus</translation> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation>Suurin pintakulutus</translation> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation>Keskilämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation>Alin lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation>Ylin lämpötila</translation> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation>Takaisin listalle</translation> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation>Sukellus</translation> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation>Sukellusprofiili</translation> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation>Sukellustiedot</translation> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation>Sukellusvarusteet</translation> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation>Tyyppi</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation>Tilavuus</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation>Paineluokka</translation> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation>Alkupaine</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation>Loppupaine</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation>Kaasu</translation> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation>Tapahtumat</translation> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation>Nimi</translation> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation>Arvo</translation> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation>Koordinaatit</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation>Sukelluksen tila</translation> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation>yli %d päivää</translation> @@ -9202,97 +9301,97 @@ EADD: %d%s <translation>(ei sukelluksia)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation>su</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation>ma</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation>ti</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation>ke</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation>to</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation>pe</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation>la</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation>tammi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation>helmi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation>maalis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation>huhti</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation>touko</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation>kesä</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation>heinä</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation>elo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation>syys</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation>loka</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation>marras</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation>joulu</translation> </message> @@ -9337,13 +9436,13 @@ Onko Uemis Zurich kytketty oikein?</translation> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> - <translation>sukellusloki #</translation> + <source>dive log #</source> + <translation type="unfinished"/> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> - <translation>sijainti #</translation> + <source>dive spot #</source> + <translation type="unfinished"/> </message> <message> <location filename="../core/uemis-downloader.c" line="499"/> @@ -9506,122 +9605,122 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Hälytys: heikko paristo</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Päivä:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation>Kello:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation>Kesto:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Suurin syvyys:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation>Ilman lämpötila:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation>Veden lämpötila:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation>Kohde:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation>Käännetty</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation>Upposi</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> - <translation>Sukellusaika</translation> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation>Syy</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation>Kansallisuus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation>Telakka</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation>Aluksen tyypp</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation>Pituus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation>Puomi</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation>Kuivuus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation>Syrjäytys</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation>Lasti</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation>Hylyn tiedot</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation>Korkeus</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>Syvyys</translation> </message> @@ -9634,82 +9733,82 @@ Onko Uemis Zurich kytketty oikein?</translation> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> <translation>Subsurface-mobiili</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation>Pilvipalvelun tunnus</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation>Hallinnoi sukelluksia</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation>Lisää sukellus käsin</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation>Synkronoi pilvipalveluun</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation>Käytä ilman verkkoa</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation>Ota automaattinen pilvisynkronointi käyttöön</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation>Liitä GPS -sijainnit sukelluksiin</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation>Vie GPS -tiedot</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Lataa GPS -tiedot</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation>Näytä GPS -sijainnit</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation>Tyhjennä GPS:n väliaikaistiedot</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation>Asetukset</translation> </message> @@ -9739,20 +9838,15 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Tietoja</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation>Käytä sijaintipalvelua</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation>Ei GPS -yhteyttä</translation> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation>Tapahtumat</translation> - </message> </context> <context> <name>plannerDetails</name> @@ -9863,8 +9957,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation>bar</translation> </message> @@ -9885,22 +9979,13 @@ p, li { white-space: pre-wrap; } <translation>Vaihda seosta vain tarvittavilla pysähdyksillä</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation>GF matala</translation> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation>Suunnittele ilmatauot</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation>GF korkea</translation> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation>min</translation> </message> @@ -9940,88 +10025,123 @@ p, li { white-space: pre-wrap; } <translation>Konservatismi</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation>+</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation>Kaasuasetukset</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Käytetään parhaan kaasuseoksen laskentaan. Valitse paras seossyvyys käytettävissä olevien seosten taulusta syöttämällä syvyys, jonka jälkeen "B" (paras Trimix seos) tai "BN" (paras Nitrox seos)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation>GFLow</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation>GFHigh</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation>Ilmankulutus pohjalla</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation>pO₂ pohjalla</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation>Paras seos END</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Sukelluksen suunnittelu: näytä kokonaiskesto (absoluuttinen aika)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation>Näytä sukellusaika</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Sukelluksen suunnittelu: näytä pysähdysten kesto (suhteellinen aika)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation>Näytä etappien kestot</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Listataanko siirtymät erikseen sukellussuunnitelmassa?</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation>Näytä siirtymät dekossa</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation>Tarkka sukellussuunnitelma</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation>pO₂ dekossa</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation>Ilmankulutus (deko)</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index f0b55441d..13b2d22cf 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -2,24 +2,24 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team @@ -286,12 +286,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="625"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -508,42 +508,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -849,6 +849,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation type="unfinished"/> </message> @@ -966,7 +967,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> + <source>Always show pO₂</source> <translation type="unfinished"/> </message> <message> @@ -1309,7 +1310,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> + <source>Max. depth</source> <translation type="unfinished"/> </message> <message> @@ -1437,11 +1438,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1526,7 +1522,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> @@ -1538,7 +1534,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation type="unfinished"/> </message> @@ -1562,6 +1559,7 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation type="unfinished"/> </message> @@ -1601,42 +1599,37 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <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="250"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="253"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1749,22 +1742,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation>Obriši uron</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1772,93 +1765,93 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation>Dubina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation>Težina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -1866,72 +1859,72 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation>Težina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation>Bilješke</translation> </message> @@ -1939,18 +1932,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="165"/> + <location filename="../profile-widget/diveeventitem.cpp" line="155"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="169"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="167"/> + <location filename="../profile-widget/diveeventitem.cpp" line="171"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="168"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -1994,12 +1992,12 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation type="unfinished"/> </message> @@ -2014,7 +2012,7 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2351,7 +2349,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> @@ -2746,12 +2744,12 @@ GPS location:</source> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2797,32 +2795,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -2830,16 +2828,21 @@ GPS location:</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="112"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="111"/> <source>Dive planner points</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="115"/> <source>Available gases</source> <translation>Dostupni plinovi</translation> </message> <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation type="unfinished"/> @@ -3047,11 +3050,6 @@ p, li { white-space: pre-wrap; } <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation>Temp</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation>Težina</translation> @@ -3063,9 +3061,14 @@ p, li { white-space: pre-wrap; } <translation>Odijelo</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> + <source>Cylinder</source> <translation>Boca</translation> </message> <message> @@ -3119,7 +3122,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> @@ -3171,95 +3174,95 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="257"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="285"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3288,7 +3291,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> @@ -3307,11 +3315,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> - <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> @@ -3425,7 +3428,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/> - <source> Vendor name : </source> + <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> @@ -3502,7 +3505,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/> - <source>Connect to facebook text placeholder</source> + <source>Connect to Facebook text placeholder</source> <translation type="unfinished"/> </message> <message> @@ -3588,12 +3591,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> @@ -3601,7 +3604,8 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation type="unfinished"/> </message> @@ -3617,32 +3621,32 @@ p, li { white-space: pre-wrap; } <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation type="unfinished"/> </message> @@ -3658,12 +3662,12 @@ p, li { white-space: pre-wrap; } <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation type="unfinished"/> </message> @@ -3671,7 +3675,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="652"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -3816,8 +3820,8 @@ p, li { white-space: pre-wrap; } <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation type="unfinished"/> </message> @@ -3825,436 +3829,227 @@ p, li { white-space: pre-wrap; } <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Voditelj</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation>Vidljivost</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Oprema</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> - <source>Info</source> - <translation>Informacije</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> - <source>SAC</source> - <translation>SAC</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation>OTU</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation>Statistike</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> - <translation>Temperatura</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Uroni</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> - <source>Photos</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> + <translation>Statistika</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> + <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Boce</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> - <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> - <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> - <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> - <source>Average length of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Are you sure you want to delete all images?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> - <source>Delete selected images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation type="unfinished"/> - </message> </context> <context> <name>MainWindow</name> @@ -4304,27 +4099,17 @@ mixed from Air and using: <translation>Novi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> - <source>Ctrl+N</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="168"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> - <source>Ctrl+O</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="179"/> <source>&Save</source> <translation type="unfinished"/> @@ -4335,11 +4120,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> - <source>Ctrl+S</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="190"/> <source>Sa&ve as</source> <translation type="unfinished"/> @@ -4350,11 +4130,6 @@ mixed from Air and using: <translation>Spremi kao</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> - <source>Ctrl+Shift+S</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="201"/> <source>&Close</source> <translation type="unfinished"/> @@ -4365,61 +4140,31 @@ mixed from Air and using: <translation>Zatvori</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> - <source>Ctrl+W</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="212"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> - <source>Ctrl+P</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="220"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="223"/> - <source>Ctrl+,</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="231"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="234"/> - <source>Ctrl+Q</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="242"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Ctrl+D</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="250"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> - <source>Ctrl+G</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>Edit device &names</source> <translation type="unfinished"/> @@ -4430,11 +4175,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> - <source>Ctrl++</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Edit dive</source> <translation type="unfinished"/> @@ -4445,31 +4185,16 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> - <source>Ctrl+C</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="284"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> - <source>Ctrl+V</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="292"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="295"/> - <source>Ctrl+R</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>Auto &group</source> <translation type="unfinished"/> @@ -4480,71 +4205,36 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> - <source>Ctrl+Y</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="316"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> - <source>Ctrl+2</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="324"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> - <source>Ctrl+3</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="332"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> - <source>Ctrl+4</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="340"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> - <source>Ctrl+1</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="348"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> - <source>Left</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="356"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> - <source>Right</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="364"/> <source>&About Subsurface</source> <translation type="unfinished"/> @@ -4555,31 +4245,16 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> - <source>F1</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> - <source>Ctrl+5</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> - <source>Ctrl+L</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="396"/> <source>&Import log files</source> <translation type="unfinished"/> @@ -4590,11 +4265,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> - <source>Ctrl+I</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="407"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> @@ -4610,11 +4280,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> - <source>F11</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="446"/> <source>&Check for updates</source> <translation type="unfinished"/> @@ -4630,21 +4295,11 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="457"/> - <source>Ctrl+E</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="462"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="465"/> - <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="473"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> @@ -4735,11 +4390,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="676"/> - <source>Ctrl+F</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="688"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> @@ -4756,22 +4406,12 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="701"/> - <source>Ctrl+Z</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> <location filename="../desktop-widgets/mainwindow.cpp" line="233"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> - <source>Ctrl+Shift+Z</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>&Find moved images</source> <translation type="unfinished"/> @@ -4808,158 +4448,158 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <translation type="unfinished"/> </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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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="1817"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4967,7 +4607,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="737"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5015,89 +4655,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="398"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="399"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="406"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="412"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="420"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="421"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation>psi</translation> </message> @@ -5230,7 +4870,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> + <source>General</source> <translation type="unfinished"/> </message> <message> @@ -5301,134 +4941,155 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> - <source>Threshold for pO₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> + <source>CCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> - <source>Threshold for pN₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> + <source>Show setpoints when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> - <source>Threshold for pHe (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> + <source>Show individual O₂ sensor values when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> - <source>pO₂ in calculating MOD (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> + <source>Ceiling display setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> - <source>CCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> + <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> - <source>Dive planner default setpoint (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> + <source>Algorithm for calculated ceiling:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> - <source>Show setpoints when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> - <source>Show individual O₂ sensor values when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> - <source>Ceiling display setup</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> - <source>Draw dive computer reported ceiling red</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> - <source>Algorithm for calculated ceiling:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <source>pSCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> - <source>VPM-B</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> + <source>Dilution ratio</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> + <source>1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> - <source>+</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> - <source>GFHigh</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> - <source>GFLow</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> - <source>pSCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> - <source>Dilution ratio</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> - <source>1:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> - <source>Graph</source> - <translation type="unfinished"/> + <source>Profile</source> + <translation>Profil</translation> </message> </context> <context> @@ -5725,8 +5386,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> - <translation type="unfinished"/> + <source>cuft</source> + <translation>cuft</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> @@ -5807,17 +5468,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation type="unfinished"/> </message> @@ -5909,113 +5570,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> - <source>Make first divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> + <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> - <source>Delete this divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> - <source>Add gas change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> - <source> (Tank %1)</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6028,96 +5689,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <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="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6130,79 +5791,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>Zrak</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -6212,17 +5873,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>nepoznato</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="63"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="62"/> <source>Remove this point</source> <translation type="unfinished"/> </message> @@ -6247,22 +5908,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Max.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="679"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="686"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="698"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -6270,8 +5931,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> @@ -6313,7 +5974,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation type="unfinished"/> </message> @@ -6330,12 +5991,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> - <translation>Renumeriraj</translation> + <source>Add setpoint change</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> + <source>New setpoint (0 for OC)</source> <translation type="unfinished"/> </message> <message> @@ -6404,12 +6065,12 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="302"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="303"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="304"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="305"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -6525,49 +6186,49 @@ Not all images have timestamps in the range between <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation type="unfinished"/> @@ -6639,20 +6300,20 @@ Not all images have timestamps in the range between <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <translation type="unfinished"/> </message> @@ -6665,17 +6326,22 @@ Not all images have timestamps in the range between <translation>O programu Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> + <source>Credits</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation type="unfinished"/> </message> @@ -6688,47 +6354,47 @@ Not all images have timestamps in the range between <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="407"/> <source>Enter User ID and click Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="429"/> <source>Webservice</source> <translation>Web servis</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="505"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> <source>Connecting...</source> <translation>Spajanje...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="524"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="538"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="548"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> <source>Connection error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> <source>Invalid user identifier!</source> <translation>Neispravna korisnička oznaka</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <source>Cannot parse response!</source> <translation>Ne mogu obraditi odziv</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> <source>Download successful</source> <translation type="unfinished"/> </message> @@ -6736,7 +6402,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="678"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -6750,6 +6416,252 @@ Not all images have timestamps in the range between </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Datum</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation>OTU</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation>Statistika</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>Dubina</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Trajanje</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation>Temperatura</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Uroni</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6761,7 +6673,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -6875,87 +6787,92 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation>Uredi</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation type="unfinished"/> </message> @@ -6963,62 +6880,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation type="unfinished"/> </message> @@ -7026,7 +6943,7 @@ Not all images have timestamps in the range between <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="821"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7083,10 +7000,20 @@ Not all images have timestamps in the range between </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation>Boca</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> + <translation>Max CNS</translation> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="229"/> <source>Weight(%1)</source> <translation type="unfinished"/> @@ -7107,11 +7034,6 @@ Not all images have timestamps in the range between <translation>Odijelo</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation>Boca</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation type="unfinished"/> @@ -7132,11 +7054,6 @@ Not all images have timestamps in the range between <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> @@ -7215,7 +7132,7 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. - If you don't want Subsurface to continue checking, please click Decline.</source> +If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> @@ -7256,67 +7173,67 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> @@ -7456,12 +7373,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="337"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="358"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -7496,15 +7413,15 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation type="unfinished"/> </message> @@ -7622,7 +7539,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -7630,273 +7547,281 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation>deko zastoj</translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation>izron</translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation>Max dubina</translation> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation>promjena plina</translation> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <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="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation>odašiljač</translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation>deko</translation> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="404"/> <location filename="../core/dive.c" line="27"/> <source>fresh</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation>noć</translation> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation>špilja</translation> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation>led</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation>olupina</translation> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation>rijeka</translation> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation>drift</translation> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation>fotografija</translation> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation type="unfinished"/> </message> @@ -7957,9 +7882,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1476"/> - <location filename="../core/planner.c" line="1479"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -7996,93 +7921,93 @@ Maximum</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1472"/> - <location filename="../core/planner.c" line="1475"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation>zrak</translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation>integrirani</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation>pojas</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation>gležanj</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> - <translation>backplate olova</translation> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8154,274 +8079,275 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3317"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation>nijedan</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation>opterećenje</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation>povreda</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation>površina</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation>sigurnosna stanka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation>sigurnosna stanka (opcionalna)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation>sigurnosna stanka (obavezna)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation>dubinska stanka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation>strop (sigurnosni zastoj)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation>trajanje urona</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation>preostalo trajanje zraka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation>kurs</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation>upozorenje tkivo</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation>neispravan broj događaja</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Greška pri parsiranju datuma i vremena</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Greška pri parsiranju vremena urona</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Greška pri parsiranju maksimalne dubine</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Greška pri parsiranju broja mješavina</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation>Greška pri dohvaćanju saliniteta vode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation>Ne mogu kreirati parser za %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <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="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8438,210 +8364,248 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation>Neobično očitanje postotka %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2051"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3775"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="558"/> + <location filename="../core/planner.c" line="567"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="572"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="574"/> - <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"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="586"/> - <source>Subsurface dive plan (surface interval </source> + <location filename="../core/planner.c" line="324"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> + <source>SP change</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="590"/> - <source>Subsurface dive plan</source> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="598"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="650"/> + <location filename="../core/planner.c" line="677"/> <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="658"/> + <location filename="../core/planner.c" line="685"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="671"/> + <location filename="../core/planner.c" line="698"/> <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="678"/> + <location filename="../core/planner.c" line="705"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="723"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="726"/> - <location filename="../core/planner.c" line="730"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="739"/> - <location filename="../core/planner.c" line="751"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="774"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="776"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="796"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="798"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="803"/> - <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <location filename="../core/planner.c" line="835"/> + <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="808"/> - <source>Deco model: VPM-B at nominal conservatism</source> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <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="810"/> + <location filename="../core/planner.c" line="837"/> <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> + <location filename="../core/planner.c" line="843"/> + <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"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="842"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="844"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="869"/> + <location filename="../core/planner.c" line="899"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="875"/> + <location filename="../core/planner.c" line="905"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="877"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="879"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="897"/> + <location filename="../core/planner.c" line="964"/> <source>high 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="907"/> + <location filename="../core/planner.c" line="976"/> <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="1234"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1480"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation>ean</translation> </message> @@ -8721,26 +8685,26 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> @@ -8818,7 +8782,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> <translation type="unfinished"/> </message> @@ -8870,7 +8834,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> + <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> <message> @@ -8928,281 +8892,286 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Uroni</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation>Statistika</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation>Vidljivost</translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Voditelj</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation>Godina</translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation>Vrsta</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation>Veličina</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation>više od %d dana</translation> @@ -9253,97 +9222,97 @@ EADD: %d%s <translation>(nema urona)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation>Ned</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation>Uto</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation>Sri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation>Čet</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation>Pet</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation>Sub</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation>Pro</translation> </message> @@ -9384,12 +9353,12 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> + <source>dive log #</source> <translation type="unfinished"/> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> + <source>dive spot #</source> <translation type="unfinished"/> </message> <message> @@ -9553,205 +9522,210 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>Dubina</translation> </message> + <message> + <location filename="../profile-widget/diveprofileitem.cpp" line="196"/> + <source>planned waypoint above ceiling</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation>Postavke</translation> </message> @@ -9781,20 +9755,15 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation type="unfinished"/> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation type="unfinished"/> - </message> </context> <context> <name>plannerDetails</name> @@ -9819,8 +9788,12 @@ Is the Uemis Zurich plugged in correctly?</source> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></source> - <translation type="unfinished"/> + </source> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> + </translation> </message> </context> <context> @@ -9901,8 +9874,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation>bar</translation> </message> @@ -9923,22 +9896,13 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation>min</translation> </message> @@ -9978,88 +9942,123 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index 4e3608df7..d3eccb915 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -2,29 +2,33 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> - <translation type="unfinished"/> + <translation>A Subsurface-mobile névjegye</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> - <translation type="unfinished"/> + <translation>Mobil verziója a Subsurface merülésnyilvántartó szabad szoftvernek. +</translation> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team 2011-2017</source> - <translation type="unfinished"/> + <translation>Verzió: %1 + + © Subsurface fejlesztőcsapata + 2011-2017</translation> </message> </context> <context> @@ -38,7 +42,7 @@ <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Discovered devices</source> - <translation type="unfinished"/> + <translation>Elérhető eszközök</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> @@ -73,7 +77,7 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> <source>Name: </source> - <translation type="unfinished"/> + <translation>Név:</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> @@ -286,12 +290,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="627"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -508,42 +512,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -685,32 +689,32 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/> <source>English</source> - <translation type="unfinished"/> + <translation>Angol</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="294"/> <source>German</source> - <translation type="unfinished"/> + <translation>Német</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="299"/> <source>French</source> - <translation type="unfinished"/> + <translation>Francia</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="304"/> <source>Italian</source> - <translation type="unfinished"/> + <translation>Olasz</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/> <source>m/°C</source> - <translation type="unfinished"/> + <translation>m/°C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/> <source>ft/°F</source> - <translation type="unfinished"/> + <translation>ft/°F</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/> @@ -729,17 +733,17 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/> <source>MMDDYY</source> - <translation type="unfinished"/> + <translation>HHNNÉÉ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="365"/> <source>DDMMYY</source> - <translation type="unfinished"/> + <translation>NNHHÉÉ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="370"/> <source>YYMMDD</source> - <translation type="unfinished"/> + <translation>ÉÉHHNN</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/> @@ -750,12 +754,12 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/> <source>Date format</source> - <translation type="unfinished"/> + <translation>Dátumformátum</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/> <source>Brightness</source> - <translation type="unfinished"/> + <translation>Fényerő</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/> @@ -849,6 +853,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation type="unfinished"/> </message> @@ -882,17 +887,17 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="619"/> <source>Red</source> - <translation type="unfinished"/> + <translation>Piros</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="624"/> <source>Green</source> - <translation type="unfinished"/> + <translation>Zöld</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="629"/> <source>Blue</source> - <translation type="unfinished"/> + <translation>Kék</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/> @@ -921,7 +926,7 @@ <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"/> @@ -951,13 +956,13 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/> <source> m</source> - <translation type="unfinished"/> + <translation>m</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/> <source>Advanced settings</source> - <translation type="unfinished"/> + <translation>Haladó beállítások</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/> @@ -966,7 +971,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> + <source>Always show pO₂</source> <translation type="unfinished"/> </message> <message> @@ -1013,7 +1018,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="943"/> <source> mbar</source> - <translation type="unfinished"/> + <translation>mbar</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/> @@ -1309,7 +1314,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> + <source>Max. depth</source> <translation type="unfinished"/> </message> <message> @@ -1409,17 +1414,17 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>HH/NN/ÉÉ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2079"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>NN/HH/ÉÉ</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2084"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>ÉÉ/HH/NN</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/> @@ -1434,12 +1439,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> @@ -1526,7 +1526,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> @@ -1538,7 +1538,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation type="unfinished"/> </message> @@ -1562,6 +1563,7 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation type="unfinished"/> </message> @@ -1601,42 +1603,37 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <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="250"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="253"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1749,22 +1746,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation>Merülés törélse</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1772,93 +1769,93 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation>Dátum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation>Mélység:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -1866,72 +1863,72 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation type="unfinished"/> </message> @@ -1996,15 +1993,15 @@ 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>Merülés lista</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation type="unfinished"/> </message> @@ -2019,7 +2016,7 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2751,12 +2748,12 @@ GPS location:</source> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2802,32 +2799,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -2845,12 +2842,17 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="142"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="151"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="152"/> <source>Save new</source> <translation type="unfinished"/> </message> @@ -3052,11 +3054,6 @@ p, li { white-space: pre-wrap; } <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation type="unfinished"/> @@ -3068,10 +3065,15 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> - <translation>Pal</translation> + <source>Cylinder</source> + <translation>Palack</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="460"/> @@ -3124,7 +3126,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> @@ -3293,7 +3295,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> @@ -3312,11 +3319,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> - <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> @@ -3593,12 +3595,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> @@ -3606,7 +3608,8 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation type="unfinished"/> </message> @@ -3622,32 +3625,32 @@ p, li { white-space: pre-wrap; } <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> - <translation type="unfinished"/> + <translation>Név:</translation> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation type="unfinished"/> </message> @@ -3663,12 +3666,12 @@ p, li { white-space: pre-wrap; } <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>&Bezárás</translation> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation type="unfinished"/> </message> @@ -3676,7 +3679,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="653"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -3821,8 +3824,8 @@ p, li { white-space: pre-wrap; } <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation type="unfinished"/> </message> @@ -3830,436 +3833,227 @@ p, li { white-space: pre-wrap; } <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Merülés vezető</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Társ</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Felszerelés</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> - <source>Info</source> - <translation>Infó</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> - <source>SAC</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Merülések</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Palackok</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> - <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> - <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> - <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> - <source>Average length of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Are you sure you want to delete all images?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> - <source>Delete selected images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation type="unfinished"/> - </message> </context> <context> <name>MainWindow</name> @@ -4315,7 +4109,7 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4342,7 +4136,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.ui" line="201"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>&Bezárás</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="204"/> @@ -4658,158 +4452,158 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <translation type="unfinished"/> </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="1571"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1875"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1279"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1598"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1696"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1698"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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="1826"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1827"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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="2004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4817,7 +4611,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="738"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -4865,89 +4659,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="315"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="409"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="410"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="414"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="415"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="423"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="424"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation type="unfinished"/> </message> @@ -5080,7 +4874,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> + <source>General</source> <translation type="unfinished"/> </message> <message> @@ -5151,133 +4945,154 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> - <source>Threshold for pO₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> + <source>CCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> - <source>Threshold for pN₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> + <source>Show setpoints when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> - <source>Threshold for pHe (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> + <source>Show individual O₂ sensor values when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> - <source>pO₂ in calculating MOD (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> + <source>Ceiling display setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> - <source>CCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> + <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> - <source>Dive planner default setpoint (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> + <source>Algorithm for calculated ceiling:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> - <source>Show setpoints when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> - <source>Show individual O₂ sensor values when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> - <source>Ceiling display setup</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> - <source>Draw dive computer reported ceiling red</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> - <source>Algorithm for calculated ceiling:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <source>pSCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> - <source>VPM-B</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> + <source>Dilution ratio</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> + <source>1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> - <source>+</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> - <source>GFHigh</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> - <source>GFLow</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> - <source>pSCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> - <source>Dilution ratio</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> - <source>1:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> - <source>Graph</source> + <source>Profile</source> <translation type="unfinished"/> </message> </context> @@ -5306,7 +5121,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="74"/> <source>Date format</source> - <translation type="unfinished"/> + <translation>Dátumformátum</translation> </message> <message> <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> @@ -5575,7 +5390,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> + <source>cuft</source> <translation type="unfinished"/> </message> <message> @@ -5657,17 +5472,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation type="unfinished"/> </message> @@ -5759,113 +5574,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> - <source>Make first divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> + <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> - <source>Delete this divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> - <source>Add gas change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> - <source> (Tank %1)</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5878,96 +5693,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <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="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -5980,79 +5795,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>LÉG</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation type="unfinished"/> </message> @@ -6062,12 +5877,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation type="unfinished"/> </message> @@ -6120,8 +5935,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> @@ -6163,7 +5978,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation type="unfinished"/> </message> @@ -6180,12 +5995,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> + <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> + <source>New setpoint (0 for OC)</source> <translation type="unfinished"/> </message> <message> @@ -6375,49 +6190,49 @@ Not all images have timestamps in the range between <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation type="unfinished"/> @@ -6489,20 +6304,20 @@ Not all images have timestamps in the range between <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <translation type="unfinished"/> </message> @@ -6515,29 +6330,29 @@ Not all images have timestamps in the range between <translation>A Subsurface-ről</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> - <translation type="unfinished"/> + <translation>&Licensz</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> <source>Credits</source> - <translation type="unfinished"/> + <translation>Köszönet</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> - <translation type="unfinished"/> + <translation>&Webhely</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="101"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> - <translation type="unfinished"/> + <translation>&Bezárás</translation> </message> <message> <location filename="../desktop-widgets/about.cpp" line="19"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2017</span></source> - <translation type="unfinished"/> + <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Többplatformos merülésnyilvántartó szoftver<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, és mások, 2011-2017</span></translation> </message> </context> <context> @@ -6591,7 +6406,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="679"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -6605,6 +6420,252 @@ Not all images have timestamps in the range between </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Dátum</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>Mélység</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Időtartam</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Merülések</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6616,7 +6677,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -6730,87 +6791,92 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation>Szerkesztés</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation type="unfinished"/> </message> @@ -6818,62 +6884,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation type="unfinished"/> </message> @@ -6881,7 +6947,7 @@ Not all images have timestamps in the range between <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="822"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -6938,7 +7004,17 @@ Not all images have timestamps in the range between </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation>Palack</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> @@ -6962,11 +7038,6 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation>Pal</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation type="unfinished"/> @@ -6987,11 +7058,6 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> @@ -7111,67 +7177,67 @@ If you don't want Subsurface to continue checking, please click Decline.</s <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> @@ -7351,15 +7417,15 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation type="unfinished"/> </message> @@ -7477,7 +7543,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -7485,277 +7551,281 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> - <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/datatrak.c" line="110"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>rbt</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="379"/> - <location filename="../core/cochran.c" line="426"/> - <location filename="../core/datatrak.c" line="114"/> - <location filename="../core/libdivecomputer.c" line="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/datatrak.c" line="118"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="404"/> <location filename="../core/dive.c" line="27"/> <source>fresh</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation type="unfinished"/> </message> @@ -7816,9 +7886,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1479"/> - <location filename="../core/planner.c" line="1482"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -7855,93 +7925,93 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1475"/> - <location filename="../core/planner.c" line="1478"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation type="unfinished"/> </message> @@ -8013,275 +8083,275 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3313"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="116"/> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Hiba a dátumidő feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Hiba a merülési idő feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Hiba a max mélység feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Hiba gáz keverék számítás feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation>Hiba a víz sótartalmának lekérdezésekor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation>Hiba a gáz keverék feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation>Esemény: várakozás a felhasználóra</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation>Hiba az esemény kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8298,215 +8368,247 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2047"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation>'%s' értelmezése meghiúsult.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3771"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="561"/> + <location filename="../core/planner.c" line="567"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="575"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="577"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="877"/> - <location filename="../core/planner.c" line="903"/> - <location filename="../core/planner.c" line="913"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="815"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="589"/> - <source>Subsurface dive plan (surface interval </source> + <location filename="../core/planner.c" line="324"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> + <source>SP change</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="320"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> - <source>SP change</source> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="593"/> - <source>Subsurface dive plan</source> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="596"/> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="610"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="653"/> + <location filename="../core/planner.c" line="677"/> <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="661"/> + <location filename="../core/planner.c" line="685"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="674"/> + <location filename="../core/planner.c" line="698"/> <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="681"/> + <location filename="../core/planner.c" line="705"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="729"/> - <location filename="../core/planner.c" line="733"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="742"/> - <location filename="../core/planner.c" line="754"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="777"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="779"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="799"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="801"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="806"/> - <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <location filename="../core/planner.c" line="835"/> + <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="811"/> - <source>Deco model: VPM-B at nominal conservatism</source> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation>Subsurface</translation> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="813"/> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <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="837"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="819"/> - <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <location filename="../core/planner.c" line="843"/> + <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="827"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="845"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="847"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="872"/> + <location filename="../core/planner.c" line="899"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="905"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="880"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="882"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="964"/> <source>high 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="910"/> + <location filename="../core/planner.c" line="976"/> <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="1237"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1483"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation type="unfinished"/> </message> @@ -8586,26 +8688,26 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> @@ -8683,7 +8785,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> <translation type="unfinished"/> </message> @@ -8735,7 +8837,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> + <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> <message> @@ -8793,281 +8895,286 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Merülések</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Merülés vezető</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Társ</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation type="unfinished"/> @@ -9118,97 +9225,97 @@ EADD: %d%s <translation>(nincs merülés)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation>H</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation>P</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation>Már</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation>Ápr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation>Jún</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation>Júl</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -9249,12 +9356,12 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> + <source>dive log #</source> <translation type="unfinished"/> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> + <source>dive spot #</source> <translation type="unfinished"/> </message> <message> @@ -9418,122 +9525,122 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Dátum:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>Mélység</translation> </message> @@ -9546,82 +9653,82 @@ Is the Uemis Zurich plugged in correctly?</source> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> - <translation type="unfinished"/> + <translation>Subsurface-mobile</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> - <translation type="unfinished"/> + <translation>Merülés lista</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation type="unfinished"/> </message> @@ -9648,23 +9755,18 @@ 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>Névjegy</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation type="unfinished"/> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation type="unfinished"/> - </message> </context> <context> <name>plannerDetails</name> @@ -9775,8 +9877,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation type="unfinished"/> </message> @@ -9797,22 +9899,13 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation type="unfinished"/> </message> @@ -9852,88 +9945,123 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index ed16208f2..6d1dc1922 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -2,24 +2,24 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team @@ -286,12 +286,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="625"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation>Personil:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation>Cari teman dan divemaster</translation> </message> @@ -508,42 +508,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Tidak dapat menyimpan berkas cadangan %1. Pesan Kegagalan: %2</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation>Tidak dapat membuka berkas cadangan: %1</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation>Penataan berhasil ditulis ke perangkat</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -849,6 +849,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation type="unfinished"/> </message> @@ -966,7 +967,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> + <source>Always show pO₂</source> <translation type="unfinished"/> </message> <message> @@ -1309,8 +1310,8 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> - <translation type="unfinished"/> + <source>Max. depth</source> + <translation>Kedalaman Maks.</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1743"/> @@ -1437,11 +1438,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1526,7 +1522,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> @@ -1538,7 +1534,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation type="unfinished"/> </message> @@ -1562,6 +1559,7 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation type="unfinished"/> </message> @@ -1601,42 +1599,37 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <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="250"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="253"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1749,22 +1742,22 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1772,93 +1765,93 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -1866,72 +1859,72 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation>Catatan</translation> </message> @@ -1939,18 +1932,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="165"/> + <location filename="../profile-widget/diveeventitem.cpp" line="155"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="169"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="167"/> + <location filename="../profile-widget/diveeventitem.cpp" line="171"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Mulai</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="168"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source> end</source> <comment>Starts with space!</comment> <translation>Akhir</translation> @@ -1994,12 +1992,12 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation type="unfinished"/> </message> @@ -2014,7 +2012,7 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2351,7 +2349,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> @@ -2746,12 +2744,12 @@ GPS location:</source> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2797,32 +2795,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -2830,16 +2828,21 @@ GPS location:</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="112"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="111"/> <source>Dive planner points</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="115"/> <source>Available gases</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation type="unfinished"/> @@ -3047,11 +3050,6 @@ p, li { white-space: pre-wrap; } <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation>Berat</translation> @@ -3063,9 +3061,14 @@ p, li { white-space: pre-wrap; } <translation>Pakaian</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> + <source>Cylinder</source> <translation type="unfinished"/> </message> <message> @@ -3119,7 +3122,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> @@ -3171,95 +3174,95 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="257"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="285"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3288,7 +3291,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> @@ -3307,11 +3315,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> - <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> @@ -3425,7 +3428,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/> - <source> Vendor name : </source> + <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> @@ -3502,7 +3505,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/> - <source>Connect to facebook text placeholder</source> + <source>Connect to Facebook text placeholder</source> <translation type="unfinished"/> </message> <message> @@ -3588,12 +3591,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> @@ -3601,7 +3604,8 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation type="unfinished"/> </message> @@ -3617,32 +3621,32 @@ p, li { white-space: pre-wrap; } <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation type="unfinished"/> </message> @@ -3658,12 +3662,12 @@ p, li { white-space: pre-wrap; } <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation type="unfinished"/> </message> @@ -3671,7 +3675,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="652"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -3816,8 +3820,8 @@ p, li { white-space: pre-wrap; } <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation type="unfinished"/> </message> @@ -3825,436 +3829,227 @@ p, li { white-space: pre-wrap; } <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Waktu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation>Temperatur Udara</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation>Temperatur air</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Rekan</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation>Jarak Lihat</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation>Tag</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Perlengkapan</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> - <source>Info</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation>Rentang Waktu</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> - <source>SAC</source> - <translation>SAC</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation>OTU</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation>Kedalaman Maks.</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation>Kedalaman rata-rata</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation>Kadar Garam</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation>Statisktik</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Kedalaman</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Rentang Waktu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> - <translation>Suhu</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Selam</translation> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> + <translation>Informasi</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Tabung</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation>Berat</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation>/menit</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> - <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> - <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> - <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> - <source>Average length of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Are you sure you want to delete all images?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> - <source>Delete selected images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation type="unfinished"/> - </message> </context> <context> <name>MainWindow</name> @@ -4304,27 +4099,17 @@ mixed from Air and using: <translation>Baru</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> - <source>Ctrl+N</source> - <translation>Ctrl+N</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="168"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation>Buka</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> - <source>Ctrl+O</source> - <translation>Ctrl+O</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="179"/> <source>&Save</source> <translation type="unfinished"/> @@ -4335,11 +4120,6 @@ mixed from Air and using: <translation>Simpan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> - <source>Ctrl+S</source> - <translation>Ctrl+S</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="190"/> <source>Sa&ve as</source> <translation type="unfinished"/> @@ -4350,11 +4130,6 @@ mixed from Air and using: <translation>Simpan sebagai</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> - <source>Ctrl+Shift+S</source> - <translation>Ctrl+Shift+S</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="201"/> <source>&Close</source> <translation type="unfinished"/> @@ -4365,61 +4140,31 @@ mixed from Air and using: <translation>Tutup</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> - <source>Ctrl+W</source> - <translation>Ctrl+W</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="212"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> - <source>Ctrl+P</source> - <translation>Ctrl+P</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="220"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="223"/> - <source>Ctrl+,</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="231"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="234"/> - <source>Ctrl+Q</source> - <translation>Ctrl+Q</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="242"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Ctrl+D</source> - <translation>Ctrl+D</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="250"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> - <source>Ctrl+G</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>Edit device &names</source> <translation type="unfinished"/> @@ -4430,11 +4175,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> - <source>Ctrl++</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Edit dive</source> <translation type="unfinished"/> @@ -4445,31 +4185,16 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> - <source>Ctrl+C</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="284"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> - <source>Ctrl+V</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="292"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="295"/> - <source>Ctrl+R</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>Auto &group</source> <translation type="unfinished"/> @@ -4480,71 +4205,36 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> - <source>Ctrl+Y</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="316"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> - <source>Ctrl+2</source> - <translation>Ctrl+2</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="324"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> - <source>Ctrl+3</source> - <translation>Ctrl+3</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="332"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> - <source>Ctrl+4</source> - <translation>Ctrl+4</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="340"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> - <source>Ctrl+1</source> - <translation>Cltrl+1</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="348"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> - <source>Left</source> - <translation>Kiri</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="356"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> - <source>Right</source> - <translation>Kanan</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="364"/> <source>&About Subsurface</source> <translation type="unfinished"/> @@ -4555,31 +4245,16 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> - <source>F1</source> - <translation>F1</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> - <source>Ctrl+5</source> - <translation>Ctrl+5</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> - <source>Ctrl+L</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="396"/> <source>&Import log files</source> <translation type="unfinished"/> @@ -4590,11 +4265,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> - <source>Ctrl+I</source> - <translation>Ctrl+I</translation> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="407"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> @@ -4610,11 +4280,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> - <source>F11</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="446"/> <source>&Check for updates</source> <translation type="unfinished"/> @@ -4630,21 +4295,11 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="457"/> - <source>Ctrl+E</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="462"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="465"/> - <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="473"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> @@ -4735,11 +4390,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="676"/> - <source>Ctrl+F</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="688"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> @@ -4756,22 +4406,12 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="701"/> - <source>Ctrl+Z</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> <location filename="../desktop-widgets/mainwindow.cpp" line="233"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> - <source>Ctrl+Shift+Z</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>&Find moved images</source> <translation type="unfinished"/> @@ -4808,158 +4448,158 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <translation type="unfinished"/> </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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <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="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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="1817"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4967,7 +4607,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="737"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5015,89 +4655,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="398"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="399"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="406"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="412"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="420"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="421"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation>psi</translation> </message> @@ -5230,8 +4870,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> - <translation>Acuan</translation> + <source>General</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> @@ -5301,134 +4941,155 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> - <source>Threshold for pO₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> + <source>CCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> - <source>Threshold for pN₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> + <source>Show setpoints when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> - <source>Threshold for pHe (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> + <source>Show individual O₂ sensor values when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> - <source>pO₂ in calculating MOD (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> + <source>Ceiling display setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> - <source>CCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> + <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> - <source>Dive planner default setpoint (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> + <source>Algorithm for calculated ceiling:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> - <source>Show setpoints when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> - <source>Show individual O₂ sensor values when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <source>GFHigh</source> + <translation>GFHigh</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <source>GFLow</source> + <translation>GFlow</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> - <source>Ceiling display setup</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <source>pSCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> - <source>Draw dive computer reported ceiling red</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> + <source>Dilution ratio</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> - <source>Algorithm for calculated ceiling:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> + <source>1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> - <source>VPM-B</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> - <source>+</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> - <source>GFHigh</source> - <translation>GFHigh</translation> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> - <source>GFLow</source> - <translation>GFlow</translation> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> - <source>pSCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> - <source>Dilution ratio</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> - <source>1:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation>Lain-lain</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> - <source>Graph</source> - <translation>Grafik</translation> + <source>Profile</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5725,8 +5386,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> - <translation type="unfinished"/> + <source>cuft</source> + <translation>cuft</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> @@ -5807,17 +5468,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation type="unfinished"/> </message> @@ -5909,113 +5570,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> - <source>Make first divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> + <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> - <source>Delete this divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> - <source>Add gas change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> - <source> (Tank %1)</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6028,96 +5689,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <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="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6130,79 +5791,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>UDARA</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation>I</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -6212,17 +5873,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="63"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="62"/> <source>Remove this point</source> <translation type="unfinished"/> </message> @@ -6247,22 +5908,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Maksimal</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="679"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="686"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="698"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -6270,8 +5931,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> @@ -6313,7 +5974,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation type="unfinished"/> </message> @@ -6330,12 +5991,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> - <translation>Penomeran Ulang</translation> + <source>Add setpoint change</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> + <source>New setpoint (0 for OC)</source> <translation type="unfinished"/> </message> <message> @@ -6404,12 +6065,12 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="302"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="303"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="304"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="305"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -6525,49 +6186,49 @@ Not all images have timestamps in the range between <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>menit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation type="unfinished"/> @@ -6639,20 +6300,20 @@ Not all images have timestamps in the range between <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <translation type="unfinished"/> </message> @@ -6665,17 +6326,22 @@ Not all images have timestamps in the range between <translation>Tentang Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation>&Lisensi</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> + <source>Credits</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation>&Website</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation type="unfinished"/> </message> @@ -6688,47 +6354,47 @@ Not all images have timestamps in the range between <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="407"/> <source>Enter User ID and click Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="429"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="505"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> <source>Connecting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="524"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="538"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="548"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> <source>Connection error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> <source>Invalid user identifier!</source> <translation>identifikasi pengguna tidak cocok!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <source>Cannot parse response!</source> <translation>Respon gagal di telaah!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> <source>Download successful</source> <translation type="unfinished"/> </message> @@ -6736,7 +6402,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="678"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -6750,6 +6416,252 @@ Not all images have timestamps in the range between </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation>Informasi</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Tanggal</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation>Rentang Waktu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation>OTU</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation>Kedalaman Maks.</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation>Kedalaman rata-rata</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation>Temperatur Udara</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation>Temperatur air</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation>Kadar Garam</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation>/menit</translation> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>edalaman</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Durasi</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation>Suhu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Selam</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation>/menit</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6761,7 +6673,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -6875,87 +6787,92 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation type="unfinished"/> </message> @@ -6963,62 +6880,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation>Waktu sampel</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation>Sampel Kedalaman</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation type="unfinished"/> </message> @@ -7026,7 +6943,7 @@ Not all images have timestamps in the range between <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="821"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7083,7 +7000,17 @@ Not all images have timestamps in the range between </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> <translation type="unfinished"/> </message> <message> @@ -7107,11 +7034,6 @@ Not all images have timestamps in the range between <translation>Pakaian</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation type="unfinished"/> @@ -7132,11 +7054,6 @@ Not all images have timestamps in the range between <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> @@ -7215,7 +7132,7 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. - If you don't want Subsurface to continue checking, please click Decline.</source> +If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> @@ -7256,67 +7173,67 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> @@ -7456,12 +7373,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="337"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="358"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -7496,15 +7413,15 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation type="unfinished"/> </message> @@ -7630,7 +7547,7 @@ Rata-rata</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -7638,273 +7555,281 @@ Rata-rata</translation> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation>pemberhentian deco</translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation>nai</translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation>dalam maks</translation> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation>ganti gas</translation> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <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="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation>batas</translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation>pemancar</translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="404"/> <location filename="../core/dive.c" line="27"/> <source>fresh</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation type="unfinished"/> </message> @@ -7965,9 +7890,9 @@ Rata-rata</translation> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1476"/> - <location filename="../core/planner.c" line="1479"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8004,93 +7929,93 @@ Rata-rata</translation> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1472"/> - <location filename="../core/planner.c" line="1475"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation>udara</translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation>terintegrasi</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation>sabuk</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation>Pergelangan kaki</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> - <translation>berat plat-punggung</translation> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8162,274 +8087,275 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3317"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation>kosong</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation>beban kerja</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation>gangguan</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation>tandai</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation>permuakaan</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation>safety stop (bebas)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation>safety stop (wajib)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation>batas (safety stop)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation>waktu selam</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation>waktu mengudara</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation>judul</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation>peringatan tingkat jaringan</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation>nomor kejadian tidak sesuai</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Gagal mengurai tanggal</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Gagal mengurai waktu selam</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Gagal mengurai kedalamn maks</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Gagal mengurai perhitungan campuran gas</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation>tidak dapat membuat pengurai untuk %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8446,209 +8372,247 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="2051"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="3775"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="558"/> + <location filename="../core/planner.c" line="567"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="572"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="574"/> - <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"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="586"/> - <source>Subsurface dive plan (surface interval </source> + <location filename="../core/planner.c" line="324"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> + <source>SP change</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="590"/> - <source>Subsurface dive plan</source> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="598"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="650"/> + <location filename="../core/planner.c" line="677"/> <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="658"/> + <location filename="../core/planner.c" line="685"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="671"/> + <location filename="../core/planner.c" line="698"/> <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="678"/> + <location filename="../core/planner.c" line="705"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="723"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="726"/> - <location filename="../core/planner.c" line="730"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="739"/> - <location filename="../core/planner.c" line="751"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="774"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="776"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="796"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="798"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="803"/> - <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <location filename="../core/planner.c" line="835"/> + <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="808"/> - <source>Deco model: VPM-B at nominal conservatism</source> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <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="810"/> + <location filename="../core/planner.c" line="837"/> <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> + <location filename="../core/planner.c" line="843"/> + <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"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="842"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="844"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="869"/> + <location filename="../core/planner.c" line="899"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="875"/> + <location filename="../core/planner.c" line="905"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="877"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="879"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="897"/> + <location filename="../core/planner.c" line="964"/> <source>high 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="907"/> + <location filename="../core/planner.c" line="976"/> <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="1234"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1480"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation type="unfinished"/> </message> @@ -8728,26 +8692,26 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> @@ -8825,7 +8789,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> <translation type="unfinished"/> </message> @@ -8877,7 +8841,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> + <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> <message> @@ -8935,281 +8899,286 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Waktu</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation>Temperatur Udara</translation> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation>Temperatur air</translation> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Selam</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation>Jarak Lihat</translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Rekan</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation>Tag</translation> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation>Kedalaman Maks.</translation> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> - <translation type="unfinished"/> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> + <translation>Selam#</translation> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation>Tipe</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation>Ukuran</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation>Tekanan awal</translation> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation>Tekanan akhir</translation> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation>Koordinat</translation> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation type="unfinished"/> @@ -9260,97 +9229,97 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation type="unfinished"/> </message> @@ -9391,12 +9360,12 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> + <source>dive log #</source> <translation type="unfinished"/> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> + <source>dive spot #</source> <translation type="unfinished"/> </message> <message> @@ -9560,205 +9529,210 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>edalaman</translation> </message> + <message> + <location filename="../profile-widget/diveprofileitem.cpp" line="196"/> + <source>planned waypoint above ceiling</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation>Preferensi</translation> </message> @@ -9788,20 +9762,15 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation type="unfinished"/> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation type="unfinished"/> - </message> </context> <context> <name>plannerDetails</name> @@ -9826,7 +9795,7 @@ Is the Uemis Zurich plugged in correctly?</source> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></source> + </source> <translation type="unfinished"/> </message> </context> @@ -9908,8 +9877,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation>bar</translation> </message> @@ -9930,22 +9899,13 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation>menit</translation> </message> @@ -9985,88 +9945,123 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation>GFlow</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation>GFHigh</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation>SAC bawah</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation>Catatan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index 4f3d5421a..9e19c93d7 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -2,24 +2,24 @@ <context> <name>About</name> <message> - <location filename="../mobile-widgets/qml/About.qml" line="10"/> - <location filename="../mobile-widgets/qml/About.qml" line="19"/> + <location filename="../mobile-widgets/qml/About.qml" line="9"/> + <location filename="../mobile-widgets/qml/About.qml" line="18"/> <source>About Subsurface-mobile</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="36"/> + <location filename="../mobile-widgets/qml/About.qml" line="35"/> <source>A mobile version of the free Subsurface divelog software. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="37"/> + <location filename="../mobile-widgets/qml/About.qml" line="36"/> <source>View your dive logs while on the go.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/About.qml" line="48"/> + <location filename="../mobile-widgets/qml/About.qml" line="47"/> <source>Version: %1 © Subsurface developer team @@ -286,12 +286,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="625"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="504"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="626"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="505"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -508,42 +508,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="219"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="235"/> <source>Could not open backup file: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="583"/> <source>Dive computer details read successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="592"/> <source>Setting successfully written to device</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="601"/> <source>Device firmware successfully updated</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="610"/> <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="626"/> <source>Unable to create libdivecomputer context</source> <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="655"/> <source>Could not a establish connection to the dive computer.</source> <translation type="unfinished"/> </message> @@ -849,6 +849,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> <source>Apnea</source> <translation type="unfinished"/> </message> @@ -966,7 +967,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/> - <source>Always show ppO2</source> + <source>Always show pO₂</source> <translation type="unfinished"/> </message> <message> @@ -1309,7 +1310,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1696"/> - <source>Max depth</source> + <source>Max. depth</source> <translation type="unfinished"/> </message> <message> @@ -1437,11 +1438,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <source>Apnoea</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1526,7 +1522,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1227"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> @@ -1538,7 +1534,8 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/ContextDrawer.qml" line="77"/> <source>Actions</source> <translation type="unfinished"/> </message> @@ -1562,6 +1559,7 @@ </message> <message> <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation>Ấn bắt đầu.</translation> </message> @@ -1601,42 +1599,37 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="43"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="47"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="235"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Clicking here will remove this cylinder.</source> <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="247"/> + <location filename="../qt-models/cylindermodel.cpp" line="286"/> <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="250"/> - <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="289"/> + <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="253"/> - <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max depth.</source> + <location filename="../qt-models/cylindermodel.cpp" line="292"/> + <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="522"/> - <source>Cylinder cannot be removed</source> - <translation>Xi lanh không thể được gỡ bỏ</translation> - </message> - <message> - <location filename="../qt-models/cylindermodel.cpp" line="523"/> + <location filename="../qt-models/cylindermodel.cpp" line="272"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation> </message> @@ -1750,22 +1743,22 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="41"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="75"/> <source>Delete dive</source> <translation>Xóa lần lặn</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="90"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1773,93 +1766,93 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="83"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="87"/> <source>Date:</source> <translation>Ngày tháng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Depth:</source> <translation>Độ sâu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="136"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="175"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Weight:</source> <translation>Cân nặng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="207"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="218"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="228"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="237"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -1867,72 +1860,72 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="60"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="77"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="86"/> <source>Duration: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="121"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="118"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="136"/> <source>Dive Details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="144"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="143"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="193"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/> - <source>Dive Master:</source> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="200"/> <source>Weight:</source> <translation>Cân nặng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="207"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="289"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -1940,18 +1933,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="165"/> + <location filename="../profile-widget/diveeventitem.cpp" line="155"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="169"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="167"/> + <location filename="../profile-widget/diveeventitem.cpp" line="171"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="168"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -1995,12 +1993,12 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="95"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="97"/> <source>Depth: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="108"/> <source>Duration: </source> <translation type="unfinished"/> </message> @@ -2015,7 +2013,7 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2352,7 +2350,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/> - <source>Send the dive data to dive-share.appspot.com website</source> + <source>Send the dive data to dive-share.appspot.com website.</source> <translation type="unfinished"/> </message> <message> @@ -2747,12 +2745,12 @@ GPS location:</source> <context> <name>DiveObjectHelper</name> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="335"/> <source>%1 dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="440"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2798,32 +2796,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="142"/> + <location filename="../qt-models/diveplannermodel.cpp" line="152"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="332"/> + <location filename="../qt-models/diveplannermodel.cpp" line="343"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="334"/> + <location filename="../qt-models/diveplannermodel.cpp" line="345"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="336"/> + <location filename="../qt-models/diveplannermodel.cpp" line="347"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="338"/> + <location filename="../qt-models/diveplannermodel.cpp" line="349"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="340"/> + <location filename="../qt-models/diveplannermodel.cpp" line="351"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -2831,16 +2829,21 @@ GPS location:</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="112"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="111"/> <source>Dive planner points</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="115"/> <source>Available gases</source> <translation>Dưỡng khí hiện có</translation> </message> <message> + <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <source>Add cylinder</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../desktop-widgets/diveplanner.cpp" line="143"/> <source>Add dive data point</source> <translation type="unfinished"/> @@ -3048,11 +3051,6 @@ p, li { white-space: pre-wrap; } <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="448"/> - <source>Temp</source> - <translation>Nhiệt độ</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Weight</source> <translation>Cân nặng</translation> @@ -3064,10 +3062,15 @@ p, li { white-space: pre-wrap; } <translation>Đồ lặn</translation> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="448"/> + <source>Temp.</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="457"/> <location filename="../qt-models/divetripmodel.cpp" line="506"/> - <source>Cyl</source> - <translation>Xlanh</translation> + <source>Cylinder</source> + <translation>Xilan</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="460"/> @@ -3120,7 +3123,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="497"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> @@ -3172,95 +3175,95 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="249"/> <source>internal error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="257"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="285"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3289,7 +3292,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/> - <source>Choose file for divecomputer download logfile</source> + <source>Choose file for dive computer download logfile</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> @@ -3308,11 +3316,6 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="426"/> - <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="427"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> @@ -3426,7 +3429,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="38"/> - <source> Vendor name : </source> + <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> @@ -3503,7 +3506,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.ui" line="82"/> - <source>Connect to facebook text placeholder</source> + <source>Connect to Facebook text placeholder</source> <translation type="unfinished"/> </message> <message> @@ -3589,12 +3592,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1692"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1696"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1697"/> <source>Firmware update failed!</source> <translation type="unfinished"/> </message> @@ -3602,7 +3605,8 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami-old/src/controls/GlobalDrawer.qml" line="362"/> <source>Back</source> <translation type="unfinished"/> </message> @@ -3618,32 +3622,32 @@ p, li { white-space: pre-wrap; } <context> <name>GpsList</name> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="16"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="14"/> <source>GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="27"/> <source>Date: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="37"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="47"/> <source>Latitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="56"/> <source>Longitude: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/> + <location filename="../mobile-widgets/qml/GpsList.qml" line="99"/> <source>List of stored GPS fixes</source> <translation type="unfinished"/> </message> @@ -3659,12 +3663,12 @@ p, li { white-space: pre-wrap; } <context> <name>KMessageWidget</name> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="90"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> <source>&Close</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/kmessagewidget.cpp" line="91"/> + <location filename="../desktop-widgets/kmessagewidget.cpp" line="92"/> <source>Close message</source> <translation type="unfinished"/> </message> @@ -3672,7 +3676,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="652"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="531"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -3817,8 +3821,8 @@ p, li { white-space: pre-wrap; } <context> <name>Log</name> <message> - <location filename="../mobile-widgets/qml/Log.qml" line="15"/> - <location filename="../mobile-widgets/qml/Log.qml" line="23"/> + <location filename="../mobile-widgets/qml/Log.qml" line="13"/> + <location filename="../mobile-widgets/qml/Log.qml" line="21"/> <source>Application Log</source> <translation type="unfinished"/> </message> @@ -3826,436 +3830,227 @@ p, li { white-space: pre-wrap; } <context> <name>MainTab</name> <message> - <location filename="../desktop-widgets/maintab.ui" line="18"/> - <location filename="../desktop-widgets/maintab.ui" line="439"/> - <location filename="../desktop-widgets/maintab.cpp" line="539"/> - <location filename="../desktop-widgets/maintab.cpp" line="571"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="511"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="543"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="21"/> - <source>General notes about the current selection</source> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="14"/> + <source>Form</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="92"/> - <location filename="../desktop-widgets/maintab.ui" line="646"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="87"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="97"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="112"/> - <location filename="../desktop-widgets/maintab.ui" line="836"/> - <location filename="../desktop-widgets/maintab.cpp" line="306"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="292"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="122"/> - <location filename="../desktop-widgets/maintab.ui" line="855"/> - <location filename="../desktop-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="293"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="184"/> - <location filename="../desktop-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="542"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="214"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="222"/> <source>Edit dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="217"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="225"/> <source>...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="252"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="260"/> <source>Divemaster</source> <translation>Người lặn giỏi nhất</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="262"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="270"/> <source>Buddy</source> <translation>Bạn</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="316"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="321"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="329"/> <source>Visibility</source> <translation>Tầm nhìn</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="328"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="336"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="387"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="395"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="397"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="405"/> <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="491"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="499"/> <source>Equipment</source> <translation>Dụng cụ</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="494"/> - <source>Used equipment in the current selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="586"/> - <source>Info</source> - <translation>Thông tin</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="589"/> - <source>Dive information</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="665"/> - <source>Interval</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="684"/> - <source>Gases used</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="703"/> - <source>Gas consumed</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="722"/> - <location filename="../desktop-widgets/maintab.ui" line="1094"/> - <source>SAC</source> - <translation>SAC</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="741"/> - <source>CNS</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="760"/> - <source>OTU</source> - <translation>OTU</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="779"/> - <source>Max. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="798"/> - <source>Avg. depth</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="817"/> - <source>Air pressure</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="874"/> - <source>Dive time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="893"/> - <source>Salinity</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="930"/> - <source>Stats</source> - <translation>Trạng thái</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="933"/> - <source>Simple statistics about the selection</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="986"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="164"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="998"/> + <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="80"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1027"/> - <source>Temperature</source> - <translation>Nhiệt độ</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1039"/> - <source>Total time</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1058"/> - <source>Dives</source> - <translation>Lần lặn</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1106"/> - <source>Gas consumption</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.ui" line="1148"/> - <source>Photos</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <source>Extra Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1151"/> - <source>All photos from the current selection</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="49"/> + <source>Information</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1177"/> - <source>Extra data</source> - <translation type="unfinished"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="51"/> + <source>Statistics</source> + <translation>Thống kê</translation> </message> <message> - <location filename="../desktop-widgets/maintab.ui" line="1180"/> - <source>Adittional data from the dive computer</source> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="53"/> + <source>Photos</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="63"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Apply changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Discard changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="88"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="92"/> <source>Cylinders</source> <translation>Xilanh</translation> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="93"/> <source>Add cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="92"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="96"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="93"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> <source>Add weight system</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Freedive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="289"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="290"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="329"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="350"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="336"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="338"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="501"/> - <location filename="../desktop-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="469"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="497"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="608"/> - <location filename="../desktop-widgets/maintab.cpp" line="644"/> - <location filename="../desktop-widgets/maintab.cpp" line="648"/> - <location filename="../desktop-widgets/maintab.cpp" line="652"/> - <source>/min</source> - <translation>/nhỏ nhất</translation> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="641"/> - <source>Deepest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="642"/> - <source>Shallowest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="655"/> - <source>Highest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="656"/> - <source>Lowest total SAC of a dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="657"/> - <source>Average total SAC of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="668"/> - <source>Highest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="669"/> - <source>Lowest temperature</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="670"/> - <source>Average temperature of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="683"/> - <source>Longest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="684"/> - <source>Shortest dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="685"/> - <source>Average length of all selected dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="709"/> - <source>These gases could be -mixed from Air and using: -</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="713"/> - <source> and </source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="843"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="706"/> <source>New dive site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1139"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1004"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/maintab.cpp" line="1140"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1005"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Deleting Images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1594"/> - <source>Are you sure you want to delete all images?</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1653"/> - <source>Load image(s) from file(s)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1654"/> - <source>Load image(s) from web</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1656"/> - <source>Delete selected images</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/maintab.cpp" line="1657"/> - <source>Delete all images</source> - <translation type="unfinished"/> - </message> </context> <context> <name>MainWindow</name> @@ -4305,27 +4100,17 @@ mixed from Air and using: <translation>Mới</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> - <source>Ctrl+N</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="168"/> <source>&Open logbook</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> <source>Open</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> - <source>Ctrl+O</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="179"/> <source>&Save</source> <translation type="unfinished"/> @@ -4336,11 +4121,6 @@ mixed from Air and using: <translation>Lưu lại</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> - <source>Ctrl+S</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="190"/> <source>Sa&ve as</source> <translation type="unfinished"/> @@ -4351,11 +4131,6 @@ mixed from Air and using: <translation>Lưu dưới dạng</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> - <source>Ctrl+Shift+S</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="201"/> <source>&Close</source> <translation type="unfinished"/> @@ -4366,61 +4141,31 @@ mixed from Air and using: <translation>Đóng lại</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="207"/> - <source>Ctrl+W</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="212"/> <source>&Print</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="215"/> - <source>Ctrl+P</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="220"/> <source>P&references</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="223"/> - <source>Ctrl+,</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="231"/> <source>&Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="234"/> - <source>Ctrl+Q</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="242"/> <source>Import from &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="245"/> - <source>Ctrl+D</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="250"/> <source>Import &GPS data from Subsurface web service</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="253"/> - <source>Ctrl+G</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>Edit device &names</source> <translation type="unfinished"/> @@ -4431,11 +4176,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> - <source>Ctrl++</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Edit dive</source> <translation type="unfinished"/> @@ -4446,31 +4186,16 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="279"/> - <source>Ctrl+C</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="284"/> <source>&Paste dive components</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="287"/> - <source>Ctrl+V</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="292"/> <source>&Renumber</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="295"/> - <source>Ctrl+R</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>Auto &group</source> <translation type="unfinished"/> @@ -4481,71 +4206,36 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="311"/> - <source>Ctrl+Y</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="316"/> <source>&Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="319"/> - <source>Ctrl+2</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="324"/> <source>&Profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="327"/> - <source>Ctrl+3</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="332"/> <source>&Info</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="335"/> - <source>Ctrl+4</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="340"/> <source>&All</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="343"/> - <source>Ctrl+1</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="348"/> <source>P&revious DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="351"/> - <source>Left</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="356"/> <source>&Next DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="359"/> - <source>Right</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="364"/> <source>&About Subsurface</source> <translation type="unfinished"/> @@ -4556,31 +4246,16 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="375"/> - <source>F1</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Globe</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="383"/> - <source>Ctrl+5</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> <source>P&lan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="391"/> - <source>Ctrl+L</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="396"/> <source>&Import log files</source> <translation type="unfinished"/> @@ -4591,11 +4266,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="402"/> - <source>Ctrl+I</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="407"/> <source>Import &from divelogs.de</source> <translation type="unfinished"/> @@ -4611,11 +4281,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="421"/> - <source>F11</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="446"/> <source>&Check for updates</source> <translation type="unfinished"/> @@ -4631,21 +4296,11 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="457"/> - <source>Ctrl+E</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="462"/> <source>Configure &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="465"/> - <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="473"/> <source>Edit &dive in planner</source> <translation type="unfinished"/> @@ -4736,11 +4391,6 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="676"/> - <source>Ctrl+F</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="688"/> <source>Toggle tissue heat-map</source> <translation type="unfinished"/> @@ -4757,22 +4407,12 @@ mixed from Air and using: <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="701"/> - <source>Ctrl+Z</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> <location filename="../desktop-widgets/mainwindow.cpp" line="233"/> <source>&Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="709"/> - <source>Ctrl+Shift+Z</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>&Find moved images</source> <translation type="unfinished"/> @@ -4809,158 +4449,158 @@ mixed from Air and using: </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="332"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="365"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> <source>Disconnect from</source> <translation type="unfinished"/> </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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="515"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="519"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="623"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="629"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="637"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> - <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="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="663"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="688"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <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="1817"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <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="1995"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4968,7 +4608,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="737"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="616"/> <source>Filter shows %1 (of %2) dives</source> <translation type="unfinished"/> </message> @@ -5016,89 +4656,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="312"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="339"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="398"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="427"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="399"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="401"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="402"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="405"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="406"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="407"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="408"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="411"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="412"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="420"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="421"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>psi</source> <translation>psi</translation> </message> @@ -5231,7 +4871,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> - <source>Defaults</source> + <source>General</source> <translation type="unfinished"/> </message> <message> @@ -5302,134 +4942,155 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> - <source>Threshold for pO₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="129"/> + <source>CCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> - <source>Threshold for pN₂ (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> + <source>Show setpoints when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/> - <source>Threshold for pHe (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="82"/> + <source>Show individual O₂ sensor values when viewing pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/> - <source>pO₂ in calculating MOD (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="178"/> + <source>Ceiling display setup</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/> - <source>CCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> + <source>Draw dive computer reported ceiling red</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/> - <source>Dive planner default setpoint (bar)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> + <source>Algorithm for calculated ceiling:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/> - <source>Show setpoints when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/> - <source>Show individual O₂ sensor values when viewing pO₂</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/> - <source>Ceiling display setup</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/> - <source>Draw dive computer reported ceiling red</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> + <source>GFLow at max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/> - <source>Algorithm for calculated ceiling:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <source>pSCR options:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/> - <source>VPM-B</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> + <source>Dilution ratio</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/> - <source>VPM-B Conservatism</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> + <source>1:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/> - <source>+</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/> + <source>Threshold for pO₂ (minimum, maximum)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/> - <source>Bühlmann</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="103"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="152"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="122"/> + <source>Threshold for pN₂ (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/> - <source>GFHigh</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="39"/> + <source>Threshold for pHe (maximum only)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/> - <source>GFLow</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="62"/> + <source>pO₂ in calculating MOD (maximum only )</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/> - <source>GFLow at max depth</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="96"/> + <source>Dive planner default setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/> - <source>pSCR options:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> - <source>Metabolic rate (ℓ O₂/min)</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <source>B&ühlmann</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> - <source>Dilution ratio</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> - <source>1:</source> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <source>Metabolic rate O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <source>&VPM-B</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> <source>Misc</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show unused cylinders in Equipment tab</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show mean depth in Profile</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/> - <source>Graph</source> - <translation type="unfinished"/> + <source>Profile</source> + <translation>Hồ sơ</translation> </message> </context> <context> @@ -5726,8 +5387,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="140"/> - <source>cu ft</source> - <translation type="unfinished"/> + <source>cuft</source> + <translation>cuft</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="150"/> @@ -5808,17 +5469,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="102"/> + <location filename="../desktop-widgets/printdialog.cpp" line="103"/> <source>P&rint</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="105"/> + <location filename="../desktop-widgets/printdialog.cpp" line="106"/> <source>&Preview</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="117"/> + <location filename="../desktop-widgets/printdialog.cpp" line="118"/> <source>Print</source> <translation type="unfinished"/> </message> @@ -5910,113 +5571,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="750"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="797"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> - <source>Make first divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> + <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> - <source>Delete this divecomputer</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> - <source>Add gas change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> - <source> (Tank %1)</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> - <source>Add set-point change</source> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1468"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1483"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1553"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1554"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1677"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1678"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1683"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -6029,96 +5690,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="209"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="223"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="224"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="313"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="336"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="381"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="394"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="406"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <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="554"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="736"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="737"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="735"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1115"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6131,79 +5792,79 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="766"/> - <location filename="../core/qthelper.cpp" line="1272"/> + <location filename="../core/qthelper.cpp" line="790"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="768"/> - <location filename="../core/qthelper.cpp" line="1271"/> + <location filename="../core/qthelper.cpp" line="792"/> + <location filename="../core/qthelper.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="794"/> + <location filename="../core/qthelper.cpp" line="818"/> <source>C</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="796"/> + <location filename="../core/qthelper.cpp" line="820"/> <source>F</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="821"/> - <location filename="../core/qthelper.cpp" line="1247"/> + <location filename="../core/qthelper.cpp" line="845"/> + <location filename="../core/qthelper.cpp" line="1281"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="823"/> - <location filename="../core/qthelper.cpp" line="1248"/> + <location filename="../core/qthelper.cpp" line="847"/> + <location filename="../core/qthelper.cpp" line="1282"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="848"/> - <location filename="../core/qthelper.cpp" line="1297"/> + <location filename="../core/qthelper.cpp" line="872"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="850"/> - <location filename="../core/qthelper.cpp" line="1296"/> + <location filename="../core/qthelper.cpp" line="874"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="871"/> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="895"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>AIR</source> <translation>KHÔNG KHÍ</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="873"/> + <location filename="../core/qthelper.cpp" line="897"/> <source>EAN</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="962"/> + <location filename="../core/qthelper.cpp" line="996"/> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1232"/> + <location filename="../core/qthelper.cpp" line="1266"/> <source>OXYGEN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="1353"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="1354"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -6213,17 +5874,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>h:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="126"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="63"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="62"/> <source>Remove this point</source> <translation type="unfinished"/> </message> @@ -6248,22 +5909,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Tối đa</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> <source>Invalid response from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="633"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="679"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/> <source>Expected XML tag 'DiveDates' not found</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="686"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="698"/> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> @@ -6271,8 +5932,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1592"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1617"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1593"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1618"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> @@ -6314,7 +5975,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1716"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1717"/> <source>Reset settings failed!</source> <translation type="unfinished"/> </message> @@ -6331,12 +5992,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <name>SetpointDialog</name> <message> <location filename="../desktop-widgets/setpoint.ui" line="17"/> - <source>Renumber</source> - <translation>Đánh số lại</translation> + <source>Add setpoint change</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/setpoint.ui" line="43"/> - <source>New set-point (0 for OC)</source> + <source>New setpoint (0 for OC)</source> <translation type="unfinished"/> </message> <message> @@ -6405,12 +6066,12 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="302"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="303"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="304"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="305"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -6526,49 +6187,49 @@ Not all images have timestamps in the range between <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="300"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="303"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="304"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> <source>h:</source> <comment>abbreviation for hours plus separator</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="305"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="309"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="308"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="314"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="317"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> <source> %1</source> <translation type="unfinished"/> @@ -6640,20 +6301,20 @@ Not all images have timestamps in the range between <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="18"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> <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"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="22"/> <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> <translation type="unfinished"/> </message> @@ -6666,17 +6327,22 @@ Not all images have timestamps in the range between <translation>Thông tin</translation> </message> <message> - <location filename="../desktop-widgets/about.ui" line="80"/> + <location filename="../desktop-widgets/about.ui" line="83"/> <source>&License</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/about.ui" line="87"/> + <location filename="../desktop-widgets/about.ui" line="90"/> + <source>Credits</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/about.ui" line="97"/> <source>&Website</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/about.ui" line="94"/> + <location filename="../desktop-widgets/about.ui" line="104"/> <source>&Close</source> <translation type="unfinished"/> </message> @@ -6689,47 +6355,47 @@ Not all images have timestamps in the range between <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="407"/> <source>Enter User ID and click Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="429"/> <source>Webservice</source> <translation>Dịch vụ web</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="505"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> <source>Connecting...</source> <translation>Đang kết nối...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="524"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> <source>Download finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="538"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> <source>Download error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="548"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> <source>Connection error: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> <source>Invalid user identifier!</source> <translation>Nhận dạng người dùng không hợp lệ!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <source>Cannot parse response!</source> <translation>Không nhận được trả lời!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> <source>Download successful</source> <translation type="unfinished"/> </message> @@ -6737,7 +6403,7 @@ Not all images have timestamps in the range between <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="678"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="557"/> <source>Suits: </source> <translation type="unfinished"/> </message> @@ -6751,6 +6417,252 @@ Not all images have timestamps in the range between </message> </context> <context> + <name>TabDiveExtraInfo</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveExtraInfo.ui" line="14"/> + <source>Extra Info</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveInformation</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="14"/> + <source>Information</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="56"/> + <source>Date</source> + <translation>Ngày tháng</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="75"/> + <source>Interval</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="94"/> + <source>Gases used</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="113"/> + <source>Gas consumed</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="132"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="151"/> + <source>CNS</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="170"/> + <source>OTU</source> + <translation>OTU</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="189"/> + <source>Max. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="208"/> + <source>Avg. depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="227"/> + <source>Air pressure</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="246"/> + <source>Air temp.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="265"/> + <source>Water temp.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="284"/> + <source>Dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.ui" line="303"/> + <source>Salinity</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="70"/> + <source>/min</source> + <translation>/nhỏ nhất</translation> + </message> +</context> +<context> + <name>TabDivePhotos</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="14"/> + <source>Photos</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="45"/> + <source>Load image(s) from file(s)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <source>Load image(s) from web</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <source>Delete selected images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <source>Delete all images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Deleting Images</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="88"/> + <source>Are you sure you want to delete all images?</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>TabDiveStatistics</name> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="14"/> + <source>Statistics</source> + <translation>Thống kê</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="55"/> + <source>Depth</source> + <translation>Độ sâu</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="67"/> + <source>Duration</source> + <translation>Độ dài</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="96"/> + <source>Temperature</source> + <translation>Nhiệt độ</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="108"/> + <source>Total time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="127"/> + <source>Dives</source> + <translation>Lần lặn</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="163"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.ui" line="175"/> + <source>Gas consumption</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="11"/> + <source>Highest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="12"/> + <source>Lowest total SAC of a dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="13"/> + <source>Average total SAC of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="14"/> + <source>Highest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="15"/> + <source>Lowest temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="16"/> + <source>Average temperature of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="17"/> + <source>Deepest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="18"/> + <source>Shallowest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="19"/> + <source>Longest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="20"/> + <source>Shortest dive</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="21"/> + <source>Average length of all selected dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="63"/> + <source>/min</source> + <translation>/nhỏ nhất</translation> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="115"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="119"/> + <source> and </source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>TableView</name> <message> <location filename="../desktop-widgets/tableview.ui" line="14"/> @@ -6762,7 +6674,7 @@ Not all images have timestamps in the range between <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="599"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="478"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -6876,87 +6788,92 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="241"/> + <location filename="../desktop-widgets/templateedit.ui" line="227"/> + <source>Border width</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/templateedit.ui" line="271"/> <source>Template</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="264"/> + <location filename="../desktop-widgets/templateedit.ui" line="294"/> <source>Colors</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="280"/> + <location filename="../desktop-widgets/templateedit.ui" line="310"/> <source>Background</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="293"/> + <location filename="../desktop-widgets/templateedit.ui" line="323"/> <source>color1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="303"/> - <location filename="../desktop-widgets/templateedit.ui" line="343"/> - <location filename="../desktop-widgets/templateedit.ui" line="383"/> - <location filename="../desktop-widgets/templateedit.ui" line="423"/> - <location filename="../desktop-widgets/templateedit.ui" line="463"/> - <location filename="../desktop-widgets/templateedit.ui" line="503"/> + <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="533"/> <source>Edit</source> <translation>Chỉnh sửa</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="320"/> + <location filename="../desktop-widgets/templateedit.ui" line="350"/> <source>Table cells 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="333"/> + <location filename="../desktop-widgets/templateedit.ui" line="363"/> <source>color2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="360"/> + <location filename="../desktop-widgets/templateedit.ui" line="390"/> <source>Table cells 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="373"/> + <location filename="../desktop-widgets/templateedit.ui" line="403"/> <source>color3</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="400"/> + <location filename="../desktop-widgets/templateedit.ui" line="430"/> <source>Text 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="413"/> + <location filename="../desktop-widgets/templateedit.ui" line="443"/> <source>color4</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="440"/> + <location filename="../desktop-widgets/templateedit.ui" line="470"/> <source>Text 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="453"/> + <location filename="../desktop-widgets/templateedit.ui" line="483"/> <source>color5</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="480"/> + <location filename="../desktop-widgets/templateedit.ui" line="510"/> <source>Borders</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.ui" line="493"/> + <location filename="../desktop-widgets/templateedit.ui" line="523"/> <source>color6</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="133"/> + <location filename="../desktop-widgets/templateedit.cpp" line="140"/> <source>Do you want to save your changes?</source> <translation type="unfinished"/> </message> @@ -6964,62 +6881,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="313"/> + <location filename="../tests/testparse.cpp" line="314"/> <source>Sample time</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="315"/> + <location filename="../tests/testparse.cpp" line="316"/> <source>Sample depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="317"/> + <location filename="../tests/testparse.cpp" line="318"/> <source>Sample temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="319"/> + <location filename="../tests/testparse.cpp" line="320"/> <source>Sample pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="321"/> + <location filename="../tests/testparse.cpp" line="322"/> <source>Sample sensor1 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="323"/> + <location filename="../tests/testparse.cpp" line="324"/> <source>Sample sensor2 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="325"/> + <location filename="../tests/testparse.cpp" line="326"/> <source>Sample sensor3 pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="327"/> + <location filename="../tests/testparse.cpp" line="328"/> <source>Sample CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="329"/> + <location filename="../tests/testparse.cpp" line="330"/> <source>Sample NDL</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="331"/> + <location filename="../tests/testparse.cpp" line="332"/> <source>Sample TTS</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="333"/> + <location filename="../tests/testparse.cpp" line="334"/> <source>Sample stopdepth</source> <translation type="unfinished"/> </message> <message> - <location filename="../tests/testparse.cpp" line="335"/> + <location filename="../tests/testparse.cpp" line="336"/> <source>Sample pressure</source> <translation type="unfinished"/> </message> @@ -7027,7 +6944,7 @@ Not all images have timestamps in the range between <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="821"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="700"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -7084,10 +7001,20 @@ Not all images have timestamps in the range between </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="226"/> - <source>Temp(%1%2)</source> + <source>Temp.(%1%2)</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> + <source>Cylinder</source> + <translation>Xilan</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <source>Max. CNS</source> + <translation>CNS tối đa</translation> + </message> + <message> <location filename="../qt-models/divetripmodel.cpp" line="229"/> <source>Weight(%1)</source> <translation type="unfinished"/> @@ -7108,11 +7035,6 @@ Not all images have timestamps in the range between <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="235"/> - <source>Cyl</source> - <translation>Xlanh</translation> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Gas</source> <translation type="unfinished"/> @@ -7133,11 +7055,6 @@ Not all images have timestamps in the range between <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> - <source>Max CNS</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Photos before/during/after dive</source> <translation type="unfinished"/> @@ -7216,7 +7133,7 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. - If you don't want Subsurface to continue checking, please click Decline.</source> +If you don't want Subsurface to continue checking, please click Decline.</source> <translation type="unfinished"/> </message> <message> @@ -7257,67 +7174,67 @@ Not all images have timestamps in the range between <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="31"/> + <location filename="../desktop-widgets/usersurvey.ui" line="168"/> <source>Subsurface user survey</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="44"/> + <location filename="../desktop-widgets/usersurvey.ui" line="20"/> <source><html><head/><body><p>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.</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="63"/> + <location filename="../desktop-widgets/usersurvey.ui" line="47"/> <source>Technical diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="76"/> + <location filename="../desktop-widgets/usersurvey.ui" line="54"/> <source>Recreational diver</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="89"/> + <location filename="../desktop-widgets/usersurvey.ui" line="61"/> <source>Dive planner</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="102"/> + <location filename="../desktop-widgets/usersurvey.ui" line="82"/> <source>Supported dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="115"/> + <location filename="../desktop-widgets/usersurvey.ui" line="89"/> <source>Other software/sources</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="128"/> + <location filename="../desktop-widgets/usersurvey.ui" line="96"/> <source>Manually entering dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="141"/> + <location filename="../desktop-widgets/usersurvey.ui" line="103"/> <source>Android/iPhone companion app</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="154"/> + <location filename="../desktop-widgets/usersurvey.ui" line="117"/> <source>Any suggestions? (in English)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="177"/> + <location filename="../desktop-widgets/usersurvey.ui" line="127"/> <source>The following information about your system will also be submitted.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="231"/> + <location filename="../desktop-widgets/usersurvey.ui" line="40"/> <source>What kind of diver are you?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/usersurvey.ui" line="270"/> + <location filename="../desktop-widgets/usersurvey.ui" line="75"/> <source>Where are you importing data from?</source> <translation type="unfinished"/> </message> @@ -7457,12 +7374,12 @@ Language: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="337"/> <source>Operation timed out</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="358"/> <source>Transferring data...</source> <translation type="unfinished"/> </message> @@ -7497,15 +7414,15 @@ Language: %1</source> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1641"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1662"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1642"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1663"/> <source>This feature is not yet available for the selected dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="1643"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1650"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="1659"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1644"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="1660"/> <source>Failed!</source> <translation type="unfinished"/> </message> @@ -7623,7 +7540,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="779"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> @@ -7631,273 +7548,281 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <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="232"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="317"/> + <location filename="../core/cochran.c" line="387"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>deco stop</source> <translation>dừng lại deco</translation> </message> <message> - <location filename="../core/cochran.c" line="336"/> - <location filename="../core/cochran.c" line="390"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/cochran.c" line="392"/> + <location filename="../core/datatrak.c" line="114"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="234"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>ascent</source> <translation>đường dốc</translation> </message> <message> - <location filename="../core/cochran.c" line="342"/> + <location filename="../core/cochran.c" line="344"/> <location filename="../core/file.c" line="755"/> <source>battery</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="350"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/cochran.c" line="355"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>maxdepth</source> <translation>độ sâu tối đa</translation> </message> <message> - <location filename="../core/cochran.c" line="358"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="360"/> + <location filename="../core/cochran.c" line="406"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="414"/> - <location filename="../core/cochran.c" line="421"/> + <location filename="../core/cochran.c" line="367"/> + <location filename="../core/cochran.c" line="416"/> + <location filename="../core/cochran.c" line="423"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="242"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>gaschange</source> <translation>thay đổi dưỡng khí</translation> </message> <message> - <location filename="../core/cochran.c" line="370"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="233"/> + <location filename="../core/cochran.c" line="372"/> + <location filename="../core/cochran.c" line="411"/> + <location filename="../core/datatrak.c" line="112"/> + <location filename="../core/libdivecomputer.c" line="236"/> <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="235"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/cochran.c" line="428"/> + <location filename="../core/datatrak.c" line="116"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>ceiling</source> <translation>trần</translation> </message> <message> - <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/cochran.c" line="397"/> + <location filename="../core/datatrak.c" line="120"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>transmitter</source> <translation>máy phát radio</translation> </message> <message> - <location filename="../core/datatrak.c" line="153"/> - <source>Error: the file does not appear to be a DATATRAK divelog</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/datatrak.c" line="286"/> + <location filename="../core/datatrak.c" line="288"/> <source>clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="289"/> + <location filename="../core/datatrak.c" line="291"/> <source>misty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="292"/> + <location filename="../core/datatrak.c" line="294"/> <source>fog</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="295"/> + <location filename="../core/datatrak.c" line="297"/> <source>rain</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="298"/> + <location filename="../core/datatrak.c" line="300"/> <source>storm</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="301"/> + <location filename="../core/datatrak.c" line="303"/> <source>snow</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="321"/> + <location filename="../core/datatrak.c" line="323"/> <source>No suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="324"/> + <location filename="../core/datatrak.c" line="326"/> <source>Shorty</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="327"/> + <location filename="../core/datatrak.c" line="329"/> <source>Combi</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="330"/> + <location filename="../core/datatrak.c" line="332"/> <source>Wet suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="333"/> + <location filename="../core/datatrak.c" line="335"/> <source>Semidry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="336"/> + <location filename="../core/datatrak.c" line="338"/> <source>Dry suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="396"/> + <location filename="../core/datatrak.c" line="398"/> <source>no stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="398"/> + <location filename="../core/datatrak.c" line="400"/> <location filename="../core/dive.c" line="29"/> <source>deco</source> <translation>deco</translation> </message> <message> - <location filename="../core/datatrak.c" line="400"/> + <location filename="../core/datatrak.c" line="402"/> <source>single ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="402"/> + <location filename="../core/datatrak.c" line="404"/> <source>multiple ascent</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="404"/> <location filename="../core/dive.c" line="27"/> <source>fresh</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/datatrak.c" line="155"/> + <source>Error: the file does not appear to be a DATATRAK dive log</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/datatrak.c" line="406"/> + <source>fresh water</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/datatrak.c" line="408"/> <source>salt water</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="431"/> + <location filename="../core/datatrak.c" line="433"/> <source>sight seeing</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="433"/> + <location filename="../core/datatrak.c" line="435"/> <source>club dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="435"/> + <location filename="../core/datatrak.c" line="437"/> <location filename="../core/dive.c" line="28"/> <source>instructor</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="437"/> + <location filename="../core/datatrak.c" line="439"/> <source>instruction</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="439"/> + <location filename="../core/datatrak.c" line="441"/> <location filename="../core/dive.c" line="27"/> <source>night</source> <translation>ban đêm</translation> </message> <message> - <location filename="../core/datatrak.c" line="441"/> + <location filename="../core/datatrak.c" line="443"/> <location filename="../core/dive.c" line="25"/> <source>cave</source> <translation>hang động</translation> </message> <message> - <location filename="../core/datatrak.c" line="443"/> + <location filename="../core/datatrak.c" line="445"/> <location filename="../core/dive.c" line="24"/> <source>ice</source> <translation>băng</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="447"/> <source>search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="455"/> + <location filename="../core/datatrak.c" line="457"/> <location filename="../core/dive.c" line="25"/> <source>wreck</source> <translation>vật trôi dạt</translation> </message> <message> - <location filename="../core/datatrak.c" line="457"/> + <location filename="../core/datatrak.c" line="459"/> <location filename="../core/dive.c" line="26"/> <source>river</source> <translation>sông</translation> </message> <message> - <location filename="../core/datatrak.c" line="459"/> + <location filename="../core/datatrak.c" line="461"/> <location filename="../core/dive.c" line="23"/> <source>drift</source> <translation>độ trôi</translation> </message> <message> - <location filename="../core/datatrak.c" line="461"/> + <location filename="../core/datatrak.c" line="463"/> <location filename="../core/dive.c" line="28"/> <source>photo</source> <translation>hình ảnh</translation> </message> <message> - <location filename="../core/datatrak.c" line="463"/> + <location filename="../core/datatrak.c" line="465"/> <source>other</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="474"/> + <location filename="../core/datatrak.c" line="476"/> <source>Other activities</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="498"/> + <location filename="../core/datatrak.c" line="500"/> <source>Datatrak/Wlog notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="537"/> + <location filename="../core/datatrak.c" line="539"/> <source>Manually entered dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="588"/> + <location filename="../core/datatrak.c" line="590"/> <source>Unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="674"/> + <location filename="../core/datatrak.c" line="676"/> <source>Error: couldn't open the file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="687"/> + <location filename="../core/datatrak.c" line="689"/> <source>Error: no dive</source> <translation type="unfinished"/> </message> @@ -7958,9 +7883,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="33"/> - <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1476"/> - <location filename="../core/planner.c" line="1479"/> + <location filename="../core/equipment.c" line="90"/> + <location filename="../core/planner.c" line="1545"/> + <location filename="../core/planner.c" line="1548"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -7997,93 +7922,93 @@ Maximum</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="269"/> + <location filename="../core/dive.c" line="273"/> <location filename="../core/qthelper.cpp" line="595"/> <location filename="../core/qthelper.cpp" line="610"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="274"/> + <location filename="../core/dive.c" line="278"/> <location filename="../core/qthelper.cpp" line="598"/> <location filename="../core/qthelper.cpp" line="612"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="297"/> + <location filename="../core/dive.c" line="301"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="299"/> + <location filename="../core/dive.c" line="303"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="304"/> + <location filename="../core/dive.c" line="308"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="306"/> + <location filename="../core/dive.c" line="310"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="325"/> + <location filename="../core/dive.c" line="329"/> <location filename="../core/qthelper.cpp" line="621"/> <location filename="../core/qthelper.cpp" line="631"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="329"/> + <location filename="../core/dive.c" line="333"/> <location filename="../core/qthelper.cpp" line="619"/> <location filename="../core/qthelper.cpp" line="629"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../core/dive.c" line="1751"/> + <location filename="../core/dive.c" line="1755"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> <location filename="../core/divelist.c" line="491"/> - <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1472"/> - <location filename="../core/planner.c" line="1475"/> + <location filename="../core/equipment.c" line="86"/> + <location filename="../core/planner.c" line="1541"/> + <location filename="../core/planner.c" line="1544"/> <source>air</source> <translation>không khí</translation> </message> <message> - <location filename="../core/equipment.c" line="86"/> + <location filename="../core/equipment.c" line="88"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="198"/> + <location filename="../core/equipment.c" line="202"/> <source>integrated</source> <translation>được tích hợp</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="203"/> <source>belt</source> <translation>dây ràng</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="204"/> <source>ankle</source> <translation>mắt cá chân</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> - <source>backplate weight</source> - <translation>cân nặng giáp che</translation> + <location filename="../core/equipment.c" line="205"/> + <source>backplate</source> + <translation type="unfinished"/> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="206"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -8155,274 +8080,275 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="134"/> + <location filename="../core/git-access.c" line="136"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="157"/> - <location filename="../core/git-access.c" line="177"/> + <location filename="../core/git-access.c" line="159"/> + <location filename="../core/git-access.c" line="179"/> <source>Could not update local cache to newer remote data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="170"/> + <location filename="../core/git-access.c" line="172"/> <source>Subsurface cloud storage corrupted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="284"/> + <location filename="../core/git-access.c" line="286"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="344"/> + <location filename="../core/git-access.c" line="346"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="374"/> + <location filename="../core/git-access.c" line="376"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="408"/> + <location filename="../core/git-access.c" line="410"/> <source>Remote storage and local data diverged</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="411"/> + <location filename="../core/git-access.c" line="413"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="420"/> + <location filename="../core/git-access.c" line="422"/> <source>Problems with local cache of Subsurface cloud data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="423"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="743"/> + <location filename="../core/git-access.c" line="750"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="746"/> + <location filename="../core/git-access.c" line="753"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="218"/> - <location filename="../core/parse-xml.c" line="3317"/> + <location filename="../core/libdivecomputer.c" line="221"/> + <location filename="../core/parse-xml.c" line="3321"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="231"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>none</source> <translation>không</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/datatrak.c" line="118"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>workload</source> <translation>tải công việc</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>violation</source> <translation>độ xâm phạm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/libdivecomputer.c" line="242"/> <source>bookmark</source> <translation>đánh dấu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="240"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>surface</source> <translation>bề mặt</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="241"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop</source> <translation>dừng an toàn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="243"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>safety stop (voluntary)</source> <translation>dừng an toàn (tự nguyện)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>safety stop (mandatory)</source> <translation>dừng an toàn (bắt buộc)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="245"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="246"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>ceiling (safety stop)</source> <translation>trần (độ an toàn)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="247"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="248"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>divetime</source> <translation>thời gian lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>airtime</source> <translation>thời gian không khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>heading</source> <translation>thẳng tiến</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>tissue level warning</source> <translation>cảnh báo cấp độ mô</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>invalid event number</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="592"/> + <location filename="../core/libdivecomputer.c" line="595"/> <source>Error parsing the datetime</source> <translation>Lỗi khi chuyển thông số thời gian</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="610"/> + <location filename="../core/libdivecomputer.c" line="613"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="616"/> + <location filename="../core/libdivecomputer.c" line="619"/> <source>Error parsing the divetime</source> <translation>Lỗi khi chuyển thông số thời gian lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="629"/> <source>Error parsing the maxdepth</source> <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="645"/> + <location filename="../core/libdivecomputer.c" line="648"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="665"/> + <location filename="../core/libdivecomputer.c" line="668"/> <source>Error parsing the gas mix count</source> <translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error obtaining water salinity</source> <translation>Lỗi khi thu nhận độ mặn của nước</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="686"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="711"/> - <source>Error obtaining divemode</source> + <location filename="../core/libdivecomputer.c" line="714"/> + <source>Error obtaining dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="731"/> + <location filename="../core/libdivecomputer.c" line="734"/> <source>Error parsing the gas mix</source> <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="756"/> + <location filename="../core/libdivecomputer.c" line="759"/> <source>Unable to create parser for %s %s</source> <translation>Không thể tạo việc chuyển thông số cho %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="762"/> + <location filename="../core/libdivecomputer.c" line="765"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="783"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error parsing the samples</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="921"/> + <location filename="../core/libdivecomputer.c" line="924"/> <source>Event: waiting for user action</source> <translation>Sự kiện: đang đợi thao tác từ người dùng</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="929"/> + <location filename="../core/libdivecomputer.c" line="932"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="993"/> + <location filename="../core/libdivecomputer.c" line="996"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="998"/> + <location filename="../core/libdivecomputer.c" line="1001"/> <source>Error registering the cancellation handler.</source> <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1058"/> + <location filename="../core/libdivecomputer.c" line="1061"/> <source>Unable to create libdivecomputer context</source> <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1065"/> + <location filename="../core/libdivecomputer.c" line="1068"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1090"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="194"/> - <location filename="../core/parse-xml.c" line="1242"/> + <location filename="../core/load-git.c" line="196"/> + <location filename="../core/parse-xml.c" line="1244"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="222"/> - <location filename="../core/parse-xml.c" line="1304"/> + <location filename="../core/load-git.c" line="224"/> + <location filename="../core/parse-xml.c" line="1306"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8439,210 +8365,248 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="517"/> + <location filename="../core/parse-xml.c" line="519"/> <source>Strange percentage reading %s </source> <translation>Đang đọc tỉ lệ lạ %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2051"/> + <location filename="../core/parse-xml.c" line="2052"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3775"/> + <location filename="../core/parse-xml.c" line="3779"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="558"/> + <location filename="../core/planner.c" line="567"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="572"/> + <location filename="../core/planner.c" line="581"/> <source>Decompression calculation aborted due to excessive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="574"/> - <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"/> + <location filename="../core/planner.c" line="583"/> + <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="904"/> + <location filename="../core/planner.c" line="932"/> + <location filename="../core/planner.c" line="967"/> + <location filename="../core/planner.c" line="979"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="839"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="586"/> - <source>Subsurface dive plan (surface interval </source> + <location filename="../core/planner.c" line="324"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="202"/> + <source>SP change</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="562"/> + <source>VPM-B</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="590"/> - <source>Subsurface dive plan</source> + <location filename="../core/planner.c" line="564"/> + <source>BUHLMANN</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="609"/> <source>Runtime: %dmin<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="598"/> + <location filename="../core/planner.c" line="614"/> <source>depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="601"/> + <location filename="../core/planner.c" line="617"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="604"/> + <location filename="../core/planner.c" line="620"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="623"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="650"/> + <location filename="../core/planner.c" line="677"/> <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="658"/> + <location filename="../core/planner.c" line="685"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="671"/> + <location filename="../core/planner.c" line="698"/> <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="678"/> + <location filename="../core/planner.c" line="705"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="723"/> + <location filename="../core/planner.c" line="750"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="726"/> - <location filename="../core/planner.c" line="730"/> + <location filename="../core/planner.c" line="753"/> + <location filename="../core/planner.c" line="757"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="739"/> - <location filename="../core/planner.c" line="751"/> + <location filename="../core/planner.c" line="766"/> + <location filename="../core/planner.c" line="778"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="774"/> + <location filename="../core/planner.c" line="801"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="776"/> + <location filename="../core/planner.c" line="803"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="796"/> + <location filename="../core/planner.c" line="823"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="798"/> + <location filename="../core/planner.c" line="825"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="803"/> - <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <location filename="../core/planner.c" line="835"/> + <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="808"/> - <source>Deco model: VPM-B at nominal conservatism</source> + <location filename="../core/planner.c" line="595"/> + <location filename="../core/planner.c" line="603"/> + <source>Subsurface</source> + <translation>Subsurface</translation> + </message> + <message> + <location filename="../core/planner.c" line="597"/> + <source>dive plan</b> (surface interval </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="599"/> + <source>created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="605"/> + <source>dive plan</b> created on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="830"/> + <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="810"/> + <location filename="../core/planner.c" line="837"/> <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> + <location filename="../core/planner.c" line="843"/> + <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"/> + <location filename="../core/planner.c" line="851"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="842"/> + <location filename="../core/planner.c" line="869"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="844"/> + <location filename="../core/planner.c" line="871"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="869"/> + <location filename="../core/planner.c" line="899"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="875"/> + <location filename="../core/planner.c" line="905"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="877"/> - <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> + <location filename="../core/planner.c" line="926"/> + <source><br>&nbsp;&mdash; <span style='color: green;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="933"/> + <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/planner.c" line="936"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="879"/> - <source>%.0f%s (%.0f%s during planned ascent) of %s</source> + <location filename="../core/planner.c" line="939"/> + <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="897"/> + <location filename="../core/planner.c" line="964"/> <source>high 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="907"/> + <location filename="../core/planner.c" line="976"/> <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="1234"/> + <location filename="../core/planner.c" line="1303"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1480"/> + <location filename="../core/planner.c" line="1549"/> <source>ean</source> <translation>ean</translation> </message> @@ -8722,26 +8686,26 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1350"/> - <source>Safetystop: %umin @ %.0f%s + <location filename="../core/profile.c" line="1358"/> + <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1353"/> - <source>Safetystop: unkn time @ %.0f%s + <location filename="../core/profile.c" line="1350"/> + <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1358"/> - <source>Deco: %umin @ %.0f%s + <location filename="../core/profile.c" line="1353"/> + <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/profile.c" line="1361"/> - <source>Deco: unkn time @ %.0f%s + <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> @@ -8819,7 +8783,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1410"/> - <source>heartbeat: %d + <source>heart rate: %d </source> <translation type="unfinished"/> </message> @@ -8871,7 +8835,7 @@ EADD: %d%s </message> <message> <location filename="../core/profile.c" line="1576"/> - <source>%s SAC:%.*f %s</source> + <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> <message> @@ -8929,281 +8893,286 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="469"/> - <location filename="../core/save-html.c" line="553"/> - <location filename="../core/worldmap-save.c" line="111"/> + <location filename="../core/save-html.c" line="471"/> + <location filename="../core/save-html.c" line="555"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="488"/> + <location filename="../core/save-html.c" line="490"/> <source>Number</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="489"/> + <location filename="../core/save-html.c" line="491"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../core/save-html.c" line="490"/> + <location filename="../core/save-html.c" line="492"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../core/save-html.c" line="491"/> + <location filename="../core/save-html.c" line="493"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../core/save-html.c" line="492"/> + <location filename="../core/save-html.c" line="494"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="493"/> + <location filename="../core/save-html.c" line="495"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="494"/> + <location filename="../core/save-html.c" line="496"/> <source>Dives</source> <translation>Lần lặn</translation> </message> <message> - <location filename="../core/save-html.c" line="495"/> + <location filename="../core/save-html.c" line="497"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../core/save-html.c" line="496"/> + <location filename="../core/save-html.c" line="498"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../core/save-html.c" line="497"/> + <location filename="../core/save-html.c" line="499"/> <source>Trips</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="498"/> + <location filename="../core/save-html.c" line="500"/> <source>Statistics</source> <translation>Thống kê</translation> </message> <message> - <location filename="../core/save-html.c" line="499"/> + <location filename="../core/save-html.c" line="501"/> <source>Advanced search</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="502"/> + <location filename="../core/save-html.c" line="504"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../core/save-html.c" line="503"/> + <location filename="../core/save-html.c" line="505"/> <source>Visibility</source> <translation>Tầm nhìn</translation> </message> <message> - <location filename="../core/save-html.c" line="504"/> + <location filename="../core/save-html.c" line="506"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../core/save-html.c" line="505"/> + <location filename="../core/save-html.c" line="507"/> <source>Divemaster</source> <translation>Người lặn giỏi nhất</translation> </message> <message> - <location filename="../core/save-html.c" line="506"/> + <location filename="../core/save-html.c" line="508"/> <source>Buddy</source> <translation>Bạn</translation> </message> <message> - <location filename="../core/save-html.c" line="507"/> + <location filename="../core/save-html.c" line="509"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../core/save-html.c" line="508"/> + <location filename="../core/save-html.c" line="510"/> <source>Tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="248"/> - <location filename="../smtk-import/smartrak.c" line="318"/> + <location filename="../core/save-html.c" line="511"/> + <location filename="../smtk-import/smartrak.c" line="258"/> + <location filename="../smtk-import/smartrak.c" line="331"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../core/save-html.c" line="510"/> + <location filename="../core/save-html.c" line="512"/> <source>Show more details</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="513"/> + <location filename="../core/save-html.c" line="515"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="514"/> + <location filename="../core/save-html.c" line="516"/> <source>Year</source> <translation>Năm</translation> </message> <message> - <location filename="../core/save-html.c" line="515"/> + <location filename="../core/save-html.c" line="517"/> <source>Total time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="516"/> + <location filename="../core/save-html.c" line="518"/> <source>Average time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="517"/> + <location filename="../core/save-html.c" line="519"/> <source>Shortest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="518"/> + <location filename="../core/save-html.c" line="520"/> <source>Longest time</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="519"/> + <location filename="../core/save-html.c" line="521"/> <source>Average depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="520"/> + <location filename="../core/save-html.c" line="522"/> <source>Min. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="521"/> + <location filename="../core/save-html.c" line="523"/> <source>Max. depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="522"/> + <location filename="../core/save-html.c" line="524"/> <source>Average SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="523"/> + <location filename="../core/save-html.c" line="525"/> <source>Min. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="524"/> + <location filename="../core/save-html.c" line="526"/> <source>Max. SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="525"/> + <location filename="../core/save-html.c" line="527"/> <source>Average temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="526"/> + <location filename="../core/save-html.c" line="528"/> <source>Min. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="527"/> + <location filename="../core/save-html.c" line="529"/> <source>Max. temp.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="528"/> + <location filename="../core/save-html.c" line="530"/> <source>Back to list</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="531"/> - <source>Dive No.</source> + <location filename="../core/save-html.c" line="533"/> + <source>Dive #</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="532"/> + <location filename="../core/save-html.c" line="534"/> <source>Dive profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="533"/> + <location filename="../core/save-html.c" line="535"/> <source>Dive information</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="534"/> + <location filename="../core/save-html.c" line="536"/> <source>Dive equipment</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="535"/> - <location filename="../core/save-html.c" line="542"/> + <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="544"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../core/save-html.c" line="536"/> + <location filename="../core/save-html.c" line="538"/> <source>Size</source> <translation>Kích thước</translation> </message> <message> - <location filename="../core/save-html.c" line="537"/> + <location filename="../core/save-html.c" line="539"/> <source>Work pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="538"/> + <location filename="../core/save-html.c" line="540"/> <source>Start pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="539"/> + <location filename="../core/save-html.c" line="541"/> <source>End pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="540"/> + <location filename="../core/save-html.c" line="542"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="541"/> + <location filename="../core/save-html.c" line="543"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../core/save-html.c" line="543"/> + <location filename="../core/save-html.c" line="545"/> <source>Events</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="544"/> + <location filename="../core/save-html.c" line="546"/> <source>Name</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="545"/> + <location filename="../core/save-html.c" line="547"/> <source>Value</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="546"/> + <location filename="../core/save-html.c" line="548"/> <source>Coordinates</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-html.c" line="547"/> + <location filename="../core/save-html.c" line="549"/> <source>Dive status</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="195"/> + <source>All (by trip stats)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="242"/> <source>more than %d days</source> <translation>đã hơn %d ngày</translation> @@ -9254,97 +9223,97 @@ EADD: %d%s <translation>(không có cuộc lặn nào)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sun</source> <translation>CN</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Mon</source> <translation>T2</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Tue</source> <translation>T3</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Wed</source> <translation>T4</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Thu</source> <translation>T5</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Fri</source> <translation>T6</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="125"/> + <location filename="../core/subsurfacestartup.c" line="128"/> <source>Sat</source> <translation>T7</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="137"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="135"/> + <location filename="../core/subsurfacestartup.c" line="138"/> <source>Dec</source> <translation>Th12</translation> </message> @@ -9385,12 +9354,12 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../core/uemis-downloader.c" line="495"/> - <source>divelog #</source> + <source>dive log #</source> <translation type="unfinished"/> </message> <message> <location filename="../core/uemis-downloader.c" line="497"/> - <source>divespot #</source> + <source>dive spot #</source> <translation type="unfinished"/> </message> <message> @@ -9554,205 +9523,210 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="39"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Ngày tháng:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="41"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="43"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="55"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/worldmap-save.c" line="59"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Built</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> + <location filename="../smtk-import/smartrak.c" line="254"/> <source>Sank</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="244"/> - <source>SankTime</source> + <location filename="../smtk-import/smartrak.c" line="254"/> + <source>Sank Time</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Reason</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Nationality</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="245"/> + <location filename="../smtk-import/smartrak.c" line="255"/> <source>Shipyard</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>ShipType</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Length</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="246"/> + <location filename="../smtk-import/smartrak.c" line="256"/> <source>Beam</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Draught</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Displacement</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="257"/> <source>Cargo</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="260"/> + <location filename="../smtk-import/smartrak.c" line="269"/> <source>Wreck Data</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smartrak.c" line="317"/> + <location filename="../smtk-import/smartrak.c" line="330"/> <source>Depth</source> <translation>Độ sâu</translation> </message> + <message> + <location filename="../profile-widget/diveprofileitem.cpp" line="196"/> + <source>planned waypoint above ceiling</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="13"/> + <location filename="../mobile-widgets/qml/main.qml" line="12"/> <source>Subsurface-mobile</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="105"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="112"/> + <location filename="../mobile-widgets/qml/main.qml" line="117"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="127"/> + <location filename="../mobile-widgets/qml/main.qml" line="132"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="141"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Manage dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="143"/> + <location filename="../mobile-widgets/qml/main.qml" line="148"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="151"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="169"/> + <location filename="../mobile-widgets/qml/main.qml" line="174"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="189"/> + <location filename="../mobile-widgets/qml/main.qml" line="191"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="192"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS-tag dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="202"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="206"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="213"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="222"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="228"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Preferences</source> <translation>Tùy biến</translation> </message> @@ -9782,20 +9756,15 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>Run location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="306"/> + <location filename="../mobile-widgets/qml/main.qml" line="292"/> <source>No GPS source available</source> <translation type="unfinished"/> </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="318"/> - <source>Actions</source> - <translation type="unfinished"/> - </message> </context> <context> <name>plannerDetails</name> @@ -9820,8 +9789,12 @@ Is the Uemis Zurich plugged in correctly?</source> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></source> - <translation type="unfinished"/> + </source> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Courier'; font-size:13pt; font-weight:400; font-style:normal;"> + </translation> </message> </context> <context> @@ -9902,8 +9875,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="549"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="578"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> <source>bar</source> <translation>bar</translation> </message> @@ -9924,22 +9897,13 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> - <source>GF low</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> - <source>GF high</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> <source>min</source> <translation>nhỏ nhất</translation> </message> @@ -9979,88 +9943,123 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <source>+</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="565"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="594"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="606"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <source>SAC factor</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <source>Problem solving time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="613"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>GFLow</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <source>GFHigh</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="620"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="627"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="634"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Notes</source> <translation>Ghi chú</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="655"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="658"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="668"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="671"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="678"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="681"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="688"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> |