diff options
Diffstat (limited to 'translations/subsurface_hr_HR.ts')
| -rw-r--r-- | translations/subsurface_hr_HR.ts | 1135 |
1 files changed, 662 insertions, 473 deletions
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 1898dad21..01776baa7 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -43,66 +43,86 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Izlaz</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation type="unfinished"/> @@ -113,22 +133,22 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation type="unfinished"/> </message> @@ -160,22 +180,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation type="unfinished"/> </message> @@ -185,113 +205,113 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation type="unfinished"/> </message> @@ -312,7 +332,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -1632,81 +1652,81 @@ <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> </context> @@ -1787,27 +1807,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <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="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <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="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <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="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1920,27 +1940,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Obriši uron</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -1948,103 +1968,103 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Datum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Dubina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Težina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation type="unfinished"/> </message> @@ -2120,23 +2140,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -2301,12 +2321,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="373"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="374"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2557,55 +2577,55 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> + <source>UDDF files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> + <source>CSV files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <source>HTML files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> + <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <source>TeX files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <source>Export CSV file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <source>Export world map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> - <source>Save image depths</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Export Subsurface XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>Export to TeX file</source> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <source>Save image depths</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> + <source>Export to TeX file</source> <translation type="unfinished"/> </message> <message> @@ -2915,7 +2935,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation type="unfinished"/> </message> @@ -2961,38 +2981,38 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="157"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="192"/> + <location filename="../qt-models/diveplannermodel.cpp" line="277"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3028,107 +3048,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pritisak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3442,69 +3462,69 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Greška</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> - <source>Choose file for dive computer binary dump file</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <source>Choose file for dive computer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> - <source>Warning</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> - <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> - <source>Dump files (*.bin)</source> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> </context> @@ -3692,12 +3712,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3891,7 +3911,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -3971,28 +3991,28 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="253"/> <source>Dive site management</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="64"/> <source>Merge into current site</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="73"/> <source>Merging dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="74"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="260"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4284,7 +4304,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="560"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4580,13 +4600,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="247"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4626,63 +4646,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="370"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="406"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="596"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <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="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="680"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4692,104 +4712,220 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="268"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="731"/> <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="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> <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="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="909"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <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="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1946"/> <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="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <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="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1287"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1307"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1308"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1309"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1310"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1311"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1312"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <source>UDDF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <source>CSV</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> <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="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1380"/> <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="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1705"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1793"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1902"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1903"/> <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="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1914"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <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="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2083"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4797,7 +4933,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4805,22 +4941,22 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4828,7 +4964,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4878,7 +5014,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> + <source>Firmware files</source> <translation type="unfinished"/> </message> </context> @@ -4903,89 +5039,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="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>Open circuit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>CCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="400"/> <source>pSCR</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="493"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="515"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="525"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="530"/> <source>psi</source> <translation>psi</translation> </message> @@ -5099,7 +5235,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="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> + <source>Subsurface files</source> <translation type="unfinished"/> </message> </context> @@ -5314,33 +5450,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation type="unfinished"/> </message> @@ -5350,27 +5486,37 @@ 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_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>These will be used as is. This might not be what you intended. +See http://doc.qt.io/qt-5/qdatetime.html#toString</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <source>Non-special character(s) in time format. -These will be used as is. This might not be what you intended. -See http://doc.qt.io/qt-5/qdatetime.html#toString</source> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> <translation type="unfinished"/> </message> </context> @@ -5781,28 +5927,53 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> - <source>Import template file</source> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> + <source>The template '%1' is read-only and connot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> + <source>Import template file</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> <translation type="unfinished"/> </message> </context> @@ -5829,11 +6000,6 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> @@ -5854,6 +6020,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> @@ -5886,7 +6057,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> @@ -6171,7 +6342,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>min</translation> </message> @@ -6179,7 +6350,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation type="unfinished"/> </message> @@ -6187,7 +6358,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation type="unfinished"/> </message> @@ -6512,7 +6683,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6626,7 +6797,7 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> + <source>Import messages (errors, warnings, etc)</source> <translation type="unfinished"/> </message> <message> @@ -6636,76 +6807,82 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> + <source>SmartTrak files</source> <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> + <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> <translation type="unfinished"/> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation type="unfinished"/> @@ -6899,7 +7076,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation type="unfinished"/> </message> @@ -7226,7 +7403,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation type="unfinished"/> </message> @@ -7904,8 +8081,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation type="unfinished"/> </message> @@ -8019,21 +8196,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation type="unfinished"/> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8364,8 +8532,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1144"/> + <location filename="../core/planner.c" line="1147"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8450,15 +8618,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> + <location filename="../core/dive.c" line="1879"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1140"/> + <location filename="../core/planner.c" line="1143"/> <source>air</source> <translation>zrak</translation> </message> @@ -8671,23 +8839,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> + <location filename="../core/parse-xml.c" line="3481"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nepoznato</translation> @@ -8829,82 +8997,82 @@ Maximum</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <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="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1280"/> <source>multiple GPS locations for this dive site; also %s </source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse-xml.c" line="1342"/> <source>additional name for site: %s </source> <translation type="unfinished"/> @@ -8938,12 +9106,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="2104"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="4003"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8962,8 +9130,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -8989,11 +9157,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="114"/> <source>Runtime: %dmin %s</source> <translation type="unfinished"/> @@ -9101,6 +9264,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9123,6 +9301,11 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> @@ -9168,22 +9351,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <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/plannernotes.c" line="454"/> - <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/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> @@ -9193,235 +9371,241 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1148"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1373"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1385"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1391"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1394"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1396"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1398"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1400"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1402"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1405"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1445"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1437"/> <source>Safety stop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1381"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1414"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1420"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1425"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1440"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1448"/> <source>Deco: unknown time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1452"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1454"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1457"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1460"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1468"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1471"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1477"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: >2h (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1482"/> <source>RBT: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1485"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1491"/> <source>Tissue %.0fmin: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1497"/> <source>heart rate: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1499"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1502"/> <source>mean depth to here %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1599"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1607"/> + <location filename="../core/profile.c" line="1611"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1615"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1619"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1627"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1634"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1659"/> <source>%s SAC: %.*f%s</source> <translation type="unfinished"/> </message> @@ -10309,117 +10493,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <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="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> <source>Apply GPS Fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Pomoć</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <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="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation type="unfinished"/> </message> @@ -10522,51 +10706,56 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="307"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="416"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>min</translation> </message> @@ -10586,153 +10775,153 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> + <source>Safety stop</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> - <source>Safety stop</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> + <source>Conservatism level</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> - <source>Conservatism level</source> + <source>+</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> - <source>+</source> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <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="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <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"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <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="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Bilješke</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation type="unfinished"/> </message> |