diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-17 15:40:24 +0900 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-06-17 15:40:24 +0900 |
| commit | 1c0b97d0a9b9db42ecb09516f9979051be832736 (patch) | |
| tree | 8189a0bc1c1f257a98394adbc7005b8b92d60446 /translations/subsurface_en_GB.ts | |
| parent | 7d92f5f8115b53fdca918f847d863ef3701976d1 (diff) | |
| download | subsurface-1c0b97d0a9b9db42ecb09516f9979051be832736.tar.gz | |
Pull latest translations from Transifex
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 2821 |
1 files changed, 1413 insertions, 1408 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index d824f0c6a..30e92a9ae 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -30,11 +30,16 @@ © Subsurface developer team 2011-2018</translation> </message> + <message> + <location filename="../mobile-widgets/qml/About.qml" line="62"/> + <source>Copy logs to clipboard</source> + <translation type="unfinished"/> + </message> </context> <context> <name>BackButton</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="51"/> <source>Navigate Back</source> <translation>Navigate back</translation> </message> @@ -323,12 +328,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="548"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="549"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/> <source>Searches for buddies and divemasters</source> <translation>Searches for buddies and divemasters</translation> </message> @@ -336,7 +341,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="287"/> + <location filename="../qt-models/filtermodels.cpp" line="279"/> <source>No buddies</source> <translation>No buddies</translation> </message> @@ -400,7 +405,7 @@ <context> <name>CloudStorageAuthenticate</name> <message> - <location filename="../core/cloudstorage.cpp" line="65"/> + <location filename="../core/cloudstorage.cpp" line="64"/> <source>Cloud account verification required, enter PIN in preferences</source> <translation>Cloud account verification required, enter PIN in preferences</translation> </message> @@ -577,6 +582,16 @@ <source>Sample setpoint</source> <translation>Sample setpoint</translation> </message> + <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> + <source>Visibility</source> + <translation>Visibility</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> + <source>Rating</source> + <translation>Rating</translation> + </message> </context> <context> <name>ConfigureDiveComputer</name> @@ -616,7 +631,7 @@ <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="659"/> + <location filename="../core/configuredivecomputer.cpp" line="647"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -711,26 +726,26 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1194"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2502"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3577"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2492"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/> <source>Basic settings</source> <translation>Basic settings</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1201"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2499"/> <source>Eco</source> <translation>Eco</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1206"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2514"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2504"/> <source>Medium</source> <translation>Medium</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1211"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2519"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2509"/> <source>High</source> <translation>High</translation> </message> @@ -751,120 +766,120 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2042"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2058"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2391"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2527"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2898"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2942"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2965"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3001"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3079"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2517"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2888"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2932"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2955"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2991"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3069"/> <source>%</source> <translation>%</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1230"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2528"/> <source>English</source> <translation>English</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2533"/> <source>German</source> <translation>German</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2548"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2538"/> <source>French</source> <translation>French</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1245"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2553"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2543"/> <source>Italian</source> <translation>Italian</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1254"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2562"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/> <source>m/°C</source> <translation>m/°C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1259"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2567"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2557"/> <source>ft/°F</source> <translation>ft/°F</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="268"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1267"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2575"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3672"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2565"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3662"/> <source>Serial No.</source> <translation>Serial No.</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="305"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1290"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2598"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3695"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2588"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3685"/> <source>Firmware version</source> <translation>Firmware version</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1301"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2599"/> <source>MMDDYY</source> <translation>MMDDYY</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1306"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2614"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2604"/> <source>DDMMYY</source> <translation>DDMMYY</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1311"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2619"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2609"/> <source>YYMMDD</source> <translation>YYMMDD</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1326"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2624"/> <source>Language</source> <translation>Language</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="388"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1336"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2634"/> <source>Date format</source> <translation>Date format</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1346"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2644"/> <source>Brightness</source> <translation>Brightness</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1356"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3866"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2654"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3856"/> <source>Units</source> <translation>Units</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1366"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2674"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2664"/> <source>Salinity (0-5%)</source> <translation>Salinity (0-5%)</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1379"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2687"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2677"/> <source>Reset device to default settings</source> <translation>Reset device to default settings</translation> </message> @@ -915,48 +930,48 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1472"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2720"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3815"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2710"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3805"/> <source>Computer model</source> <translation>Computer model</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="315"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1479"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2727"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3729"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2717"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3719"/> <source>Custom text</source> <translation>Custom text</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1497"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2745"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2735"/> <source>OC</source> <translation>OC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1502"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2750"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2740"/> <source>CC</source> <translation>CC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1507"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2755"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2745"/> <source>Gauge</source> <translation>Gauge</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1512"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2760"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2750"/> <source>Apnea</source> <translation>Apnea</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1520"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2768"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2758"/> <source>Dive mode</source> <translation>Dive mode</translation> </message> @@ -967,7 +982,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1536"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3785"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3775"/> <source>10s</source> <translation>10s</translation> </message> @@ -979,45 +994,45 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1555"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2769"/> <source>Standard</source> <translation>Standard</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1560"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2774"/> <source>Red</source> <translation>Red</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1565"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2789"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2779"/> <source>Green</source> <translation>Green</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1570"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2794"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2784"/> <source>Blue</source> <translation>Blue</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="417"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1578"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2802"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2792"/> <source>Sync dive computer time with PC</source> <translation>Sync dive computer time with PC</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1585"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2809"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2799"/> <source>Dive mode color</source> <translation>Dive mode colour</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="345"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1595"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2819"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2809"/> <source>Show safety stop</source> <translation>Show safety stop</translation> </message> @@ -1030,14 +1045,14 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1628"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2845"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2835"/> <source>Length</source> <translation>Length</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="463"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1635"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2842"/> <source>Start Depth</source> <translation>Start Depth</translation> </message> @@ -1050,7 +1065,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="573"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1719"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2885"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2875"/> <source>Advanced settings</source> <translation>Advanced settings</translation> </message> @@ -1061,7 +1076,7 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1732"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3177"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3167"/> <source>Always show pO₂</source> <translation>Always show pO₂</translation> </message> @@ -1074,27 +1089,27 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="596"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1746"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2921"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2911"/> <source>Future TTS</source> <translation>Future TTS</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2928"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2918"/> <source>Pressure sensor offset</source> <translation>Pressure sensor offset</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="815"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1760"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2935"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2925"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="792"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1783"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2958"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2948"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -1107,41 +1122,41 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="645"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1858"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2994"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2984"/> <source>Decotype</source> <translation>Decotype</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="656"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1901"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3024"/> <source>ZH-L16</source> <translation>ZH-L16</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1906"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3039"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3029"/> <source>ZH-L16+GF</source> <translation>ZH-L16+GF</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="723"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1924"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3062"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3052"/> <source>Last deco</source> <translation>Last deco</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="749"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1950"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3072"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3062"/> <source>Alt GFLow</source> <translation>Alt GFLow</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="775"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1976"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3095"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3085"/> <source>Alt GFHigh</source> <translation>Alt GFHigh</translation> </message> @@ -1180,33 +1195,33 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="877"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2028"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3102"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3092"/> <source>Bottom gas consumption</source> <translation>Bottom gas consumption</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="884"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2035"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3109"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3099"/> <source>Deco gas consumption</source> <translation>Deco gas consumption</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2106"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3204"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3194"/> <source>Temperature sensor offset</source> <translation>Temperature sensor offset</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2113"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3211"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3201"/> <source>°C</source> <translation>°C</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="892"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2133"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3231"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3221"/> <source>Gas settings</source> <translation>Gas settings</translation> </message> @@ -1229,8 +1244,8 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1677"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1699"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1845"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2862"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2981"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2852"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2971"/> <source>m</source> <translation>m</translation> </message> @@ -1239,9 +1254,9 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="861"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2090"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3116"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3132"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3148"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3106"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3122"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3138"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -1250,8 +1265,8 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1020"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2176"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3359"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3264"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3349"/> <source>%O₂</source> <translation>%O₂</translation> </message> @@ -1260,8 +1275,8 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1025"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2266"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3279"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3269"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3354"/> <source>%He</source> <translation>%He</translation> </message> @@ -1270,8 +1285,8 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1030"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2186"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3284"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3274"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3359"/> <source>Type</source> <translation>Type</translation> </message> @@ -1282,135 +1297,135 @@ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2191"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2276"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3289"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3374"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3449"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3279"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3439"/> <source>Change depth</source> <translation>Change depth</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="955"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2196"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3294"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3284"/> <source>Gas 1</source> <translation>Gas 1</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2201"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3299"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3289"/> <source>Gas 2</source> <translation>Gas 2</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3294"/> <source>Gas 3</source> <translation>Gas 3</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="970"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2211"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3309"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3299"/> <source>Gas 4</source> <translation>Gas 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="975"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2216"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3314"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3304"/> <source>Gas 5</source> <translation>Gas 5</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1040"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2281"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3379"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3369"/> <source>Dil 1</source> <translation>Dil 1</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1045"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2286"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3384"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3374"/> <source>Dil 2</source> <translation>Dil 2</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1050"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2291"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3389"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3379"/> <source>Dil 3</source> <translation>Dil 3</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1055"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2296"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3394"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3384"/> <source>Dil 4</source> <translation>Dil 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1060"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2301"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3399"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3389"/> <source>Dil 5</source> <translation>Dil 5</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1095"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3444"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3434"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1105"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2356"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3454"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3444"/> <source>SP 1</source> <translation>SP 1</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1110"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2361"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3449"/> <source>SP 2</source> <translation>SP 2</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1115"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2366"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3464"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3454"/> <source>SP 3</source> <translation>SP 3</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1136"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1152"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2444"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2460"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3519"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3535"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2450"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3509"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3525"/> <source>cbar</source> <translation>cbar</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1884"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3017"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3007"/> <source>mbar</source> <translation>mbar</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2371"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3469"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3459"/> <source>SP 4</source> <translation>SP 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2376"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3474"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3464"/> <source>SP 5</source> <translation>SP 5</translation> </message> @@ -1421,159 +1436,158 @@ </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3483"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3473"/> <source>Fixed setpoint</source> <translation>Fixed setpoint</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2413"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3488"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3478"/> <source>Sensor</source> <translation>Sensor</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2421"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3496"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3486"/> <source>Setpoint fallback</source> <translation>Setpoint fallback</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1168"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2476"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3551"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2466"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3541"/> <source>pO₂ max</source> <translation>pO₂ max</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1175"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2483"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3558"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2473"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3548"/> <source>pO₂ min</source> <translation>pO₂ min</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3599"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3589"/> <source>Safety level</source> <translation>Safety level</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3625"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3615"/> <source>Altitude range</source> <translation>Altitude range</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3632"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3622"/> <source>Model</source> <translation>Model</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="338"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3652"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3642"/> <source>Number of dives</source> <translation>Number of dives</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3712"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3702"/> <source>Max. depth</source> <translation>Max. depth</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3759"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3749"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> <translation>P0 (none)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3764"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3754"/> <source>P1 (medium)</source> <extracomment>Suunto safety level</extracomment> <translation>P1 (medium)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3769"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3759"/> <source>P2 (high)</source> <extracomment>Suunto safety level</extracomment> <translation>P2 (high)</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3777"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3767"/> <source>Sample rate</source> <translation>Sample rate</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3790"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3780"/> <source>20s</source> <translation>20s</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3795"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3785"/> <source>30s</source> <translation>30s</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3800"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3790"/> <source>60s</source> <translation>60s</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3808"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3798"/> <source>Total dive time</source> <translation>Total dive time</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1914"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3052"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3832"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3924"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3042"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3822"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3914"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3846"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3836"/> <source>24h</source> <translation>24h</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3851"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3841"/> <source>12h</source> <translation>12h</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3859"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3849"/> <source>Time format</source> <translation>Time format</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3874"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3864"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3879"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3869"/> <source>Metric</source> <translation>Metric</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1612"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2829"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3890"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2819"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3880"/> <source>s</source> <translation>s</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3897"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3887"/> <source>Light</source> <translation>Light</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3914"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3904"/> <source>Depth alarm</source> <translation>Depth alarm</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3934"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3924"/> <source>Time alarm</source> <translation>Time alarm</translation> </message> @@ -1623,127 +1637,127 @@ <translation>PSCR-GF</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2891"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2881"/> <source>Travel gas consumption</source> <translation>Travel gas consumption</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2914"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2904"/> <source>Button sensitivity</source> <translation>Button sensitivity</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3044"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3034"/> <source>VPM</source> <translation>VPM</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3184"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3174"/> <source>VPM conservatism</source> <translation>VPM conservatism</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3191"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3181"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="902"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="896"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1367"/> <source>Backup dive computer settings</source> <translation>Backup dive computer settings</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1368"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1389"/> <source>Backup files</source> <translation>Backup files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1372"/> <source>XML backup error</source> <translation>XML backup error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> <source>An error occurred while saving the backup file. %1</source> <translation>An error occurred while saving the backup file. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1376"/> <source>Backup succeeded</source> <translation>Backup succeeded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1377"/> <source>Your settings have been saved to: %1</source> <translation>Your settings have been saved to: %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1388"/> <source>Restore dive computer settings</source> <translation>Restore dive computer settings</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1394"/> <source>XML restore error</source> <translation>XML restore error</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>An error occurred while restoring the backup file. %1</source> <translation>An error occurred while restoring the backup file. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1399"/> <source>Restore succeeded</source> <translation>Restore succeeded</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1400"/> <source>Your settings have been restored successfully.</source> <translation>Your settings have been restored successfully.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1410"/> <source>Select firmware file</source> <translation>Select firmware file</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1411"/> <source>All files</source> <translation>All files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1472"/> <source>Log files</source> <translation>Log files</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1504"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1497"/> <source>Connecting to device...</source> <translation>Connecting to device...</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1530"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1523"/> <source>Connected to device</source> <translation>Connected to device</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1550"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1543"/> <source>Disconnected from device</source> <translation>Disconnected from device</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1471"/> <source>Choose file for dive computer download logfile</source> <translation>Choose logfile for dive computer download</translation> </message> @@ -1759,93 +1773,93 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>Size</source> <translation>Size</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>Work press.</source> <translation>Work press.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> - <location filename="../qt-models/cylindermodel.cpp" line="25"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> + <location filename="../qt-models/cylindermodel.cpp" line="24"/> <source>Start press.</source> <translation>Start press.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>End press.</source> <translation>End press.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>O₂%</source> <translation>O₂%</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="17"/> + <location filename="../qt-models/cylindermodel.cpp" line="16"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="18"/> + <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>Deco switch at</source> <translation>Deco. switch at</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="18"/> + <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>Bot. MOD</source> <translation>Bot. MOD</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="18"/> + <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>MND</source> <translation>MND</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="18"/> + <location filename="../qt-models/cylindermodel.cpp" line="17"/> <source>Use</source> <translation>Use</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="53"/> + <location filename="../qt-models/cylindermodel.cpp" line="52"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="57"/> + <location filename="../qt-models/cylindermodel.cpp" line="56"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="248"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <source>Clicking here will remove this cylinder.</source> <translation>Clicking here will remove this cylinder.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="260"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Switch depth for deco. gas. Calculated using Deco. pO₂ preference, unless set manually.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="263"/> + <location filename="../qt-models/cylindermodel.cpp" line="262"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="266"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="246"/> + <location filename="../qt-models/cylindermodel.cpp" line="245"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation> </message> @@ -1921,12 +1935,12 @@ <translation>Edit dive computer nicknames</translation> </message> <message> - <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/> <source>Remove the selected dive computer?</source> <translation>Remove the selected dive computer?</translation> </message> <message> - <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="51"/> + <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="50"/> <source>Are you sure that you want to remove the selected dive computer?</source> <translation>Are you sure that you want to @@ -2009,77 +2023,77 @@ GPS location:</source> GPS location:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="183"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="189"/> <source>Depth:</source> <translation>Depth:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="196"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="202"/> <source>Duration:</source> <translation>Duration:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="223"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="236"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="257"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="263"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="277"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="297"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="303"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="311"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="317"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="325"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="331"/> <source>Gas mix:</source> <translation>Gas mix:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="339"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="345"/> <source>Start Pressure:</source> <translation>Start Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="352"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="358"/> <source>End Pressure:</source> <translation>End Pressure:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="365"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="371"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="378"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="384"/> <source>Visibility:</source> <translation>Visibility:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="392"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="398"/> <source>Notes:</source> <translation>Notes:</translation> </message> @@ -2087,27 +2101,27 @@ GPS location:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="235"/> <source>No profile to show</source> <translation>No profile to show</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="241"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="247"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> @@ -2127,27 +2141,27 @@ GPS location:</translation> <translation>Visibility:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="351"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="305"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="387"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -2155,38 +2169,38 @@ GPS location:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="178"/> + <location filename="../profile-widget/diveeventitem.cpp" line="184"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="182"/> + <location filename="../profile-widget/diveeventitem.cpp" line="188"/> <source>ICD</source> <translation>ICD</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="183"/> + <location filename="../profile-widget/diveeventitem.cpp" line="189"/> <source>ΔHe</source> <translation>ΔHe</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="184"/> + <location filename="../profile-widget/diveeventitem.cpp" line="190"/> <source>ΔN₂</source> <translation>ΔN₂</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="203"/> + <location filename="../profile-widget/diveeventitem.cpp" line="211"/> <source>Manual switch to OC</source> <translation>Manual switch to OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="205"/> + <location filename="../profile-widget/diveeventitem.cpp" line="213"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="206"/> + <location filename="../profile-widget/diveeventitem.cpp" line="214"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -2195,27 +2209,27 @@ GPS location:</translation> <context> <name>DiveImportedModel</name> <message> - <location filename="../qt-models/diveimportedmodel.cpp" line="41"/> + <location filename="../qt-models/diveimportedmodel.cpp" line="39"/> <source>Date/time</source> <translation>Date/time</translation> </message> <message> - <location filename="../qt-models/diveimportedmodel.cpp" line="43"/> + <location filename="../qt-models/diveimportedmodel.cpp" line="41"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveimportedmodel.cpp" line="45"/> + <location filename="../qt-models/diveimportedmodel.cpp" line="43"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/diveimportedmodel.cpp" line="80"/> + <location filename="../qt-models/diveimportedmodel.cpp" line="78"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/diveimportedmodel.cpp" line="80"/> + <location filename="../qt-models/diveimportedmodel.cpp" line="78"/> <source>min</source> <translation>min</translation> </message> @@ -2224,23 +2238,23 @@ GPS location:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="355"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="361"/> <source>Dive list</source> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="350"/> <source>Cloud credentials</source> <translation>Cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="357"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="382"/> <source>No dives in dive list</source> <translation>No dives in dive list</translation> </message> @@ -2248,102 +2262,102 @@ GPS location:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="856"/> + <location filename="../desktop-widgets/divelistview.cpp" line="855"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="857"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="862"/> + <location filename="../desktop-widgets/divelistview.cpp" line="861"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="866"/> + <location filename="../desktop-widgets/divelistview.cpp" line="865"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="867"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="881"/> + <location filename="../desktop-widgets/divelistview.cpp" line="880"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="882"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="887"/> + <location filename="../desktop-widgets/divelistview.cpp" line="886"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="888"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="891"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="898"/> + <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="900"/> + <location filename="../desktop-widgets/divelistview.cpp" line="899"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="901"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Shift dive times</source> <translation>Shift dive times</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="902"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Split selected dives</source> <translation>Split selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="903"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Load image(s) from file(s)</source> <translation>Load image(s) from file(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="904"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image from web</source> <translation>Load image from web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="930"/> + <location filename="../desktop-widgets/divelistview.cpp" line="929"/> <source>Image files (%1)</source> <translation>Image files (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="986"/> + <location filename="../desktop-widgets/divelistview.cpp" line="985"/> <source>%1 does not appear to be an image</source> <translation>%1 does not appear to be an image</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="928"/> + <location filename="../desktop-widgets/divelistview.cpp" line="927"/> <source>Open image files</source> <translation>Open image files</translation> </message> @@ -2351,12 +2365,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="389"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Create a new dive site, copying relevant information from the current dive.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="393"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="390"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -2601,76 +2615,76 @@ GPS location:</translation> <translation>Write dive as TeX macros to file.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/> <source>Export UDDF file as</source> <translation>Export UDDF file as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>UDDF files</source> <translation>UDDF files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> <source>CSV files</source> <translation>CSV files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>HTML files</source> <translation>HTML files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> <source>TeX files</source> <translation>TeX files</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> <source>Export CSV file as</source> <translation>Export CSV file as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/> <source>Export world map</source> <translation>Export world map</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/> <source>Export Subsurface XML</source> <translation>Export Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> <source>Save image depths</source> <translation>Save image depths</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="171"/> <source>Export to TeX file</source> <translation>Export to TeX file</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> <source>Export HTML files as</source> <translation>Export HTML files as</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="193"/> <source>Please wait, exporting...</source> <translation>Please wait, exporting...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="228"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="410"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> @@ -2728,231 +2742,235 @@ GPS location:</translation> <translation>Drag the tags above to each corresponding column below</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="361"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="534"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="352"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="525"/> <source>Tab</source> <translation>Tab</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="604"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="595"/> <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source> <translation>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="760"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/> <source>Sample time</source> <translation>Sample time</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="762"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/> <source>Sample depth</source> <translation>Sample depth</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="764"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/> <source>Sample temperature</source> <translation>Sample temperature</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="766"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="639"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/> <source>Sample pO₂</source> <translation>Sample pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="768"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/> <source>Sample sensor1 pO₂</source> <translation>Sample sensor1 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="770"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/> <source>Sample sensor2 pO₂</source> <translation>Sample sensor2 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="772"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/> <source>Sample sensor3 pO₂</source> <translation>Sample sensor3 pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="774"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/> <source>Sample CNS</source> <translation>Sample CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="776"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/> <source>Sample NDL</source> <translation>Sample NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="778"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/> <source>Sample TTS</source> <translation>Sample TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="780"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/> <source>Sample stopdepth</source> <translation>Sample stopdepth</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/> <source>Sample pressure</source> <translation>Sample pressure</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/> <source>Sample setpoint</source> <translation>Sample setpoint</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="758"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/> <source>Dive #</source> <translation>Dive No.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="752"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="881"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="756"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="883"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="885"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="891"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/> <source>Max. depth</source> <translation>Max. depth</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="893"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/> <source>Avg. depth</source> <translation>Avg. depth</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="927"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="915"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="910"/> <source>Cyl. size</source> <translation>Cyl. size</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="917"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="912"/> <source>Start pressure</source> <translation>Start pressure</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="919"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> <source>End pressure</source> <translation>End pressure</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="921"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="923"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="887"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="889"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="895"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="897"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="687"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="899"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="926"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/> <source>Visibility</source> <translation>Visibility</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="901"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="903"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="905"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/> <source>Tags</source> <translation>Tags</translation> </message> @@ -2960,7 +2978,7 @@ GPS location:</translation> <context> <name>DiveObjectHelper</name> <message numerus="yes"> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="341"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="339"/> <source>(%n dive(s))</source> <translation><numerusform>(%n dive)</numerusform><numerusform>(%n dives)</numerusform></translation> </message> @@ -3031,52 +3049,57 @@ GPS location:</translation> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="263"/> + <location filename="../qt-models/diveplannermodel.cpp" line="264"/> <source>cyl.</source> <translation>cyl.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="361"/> + <location filename="../qt-models/diveplannermodel.cpp" line="368"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="363"/> + <location filename="../qt-models/diveplannermodel.cpp" line="370"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="365"/> + <location filename="../qt-models/diveplannermodel.cpp" line="372"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="367"/> + <location filename="../qt-models/diveplannermodel.cpp" line="374"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="369"/> + <location filename="../qt-models/diveplannermodel.cpp" line="376"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1010"/> + <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <source>Dive mode</source> + <translation>Dive mode</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1024"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1016"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1030"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1019"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1033"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1066"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1080"/> <source>Stop times</source> <translation>Stop times</translation> </message> @@ -3089,27 +3112,27 @@ GPS location:</translation> <translation>Dive planner points</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="117"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="118"/> <source>Available gases</source> <translation>Available gases</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="118"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="119"/> <source>Add cylinder</source> <translation>Add cylinder</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="149"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="150"/> <source>Add dive data point</source> <translation>Add dive data point</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="159"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="160"/> <source>Save new</source> <translation>Save new</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="264"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="265"/> <source>kg/ℓ</source> <translation>kg/ℓ</translation> </message> @@ -3117,107 +3140,107 @@ GPS location:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Colour</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>User entered</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Pressure S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Pressure I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Ambient pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Heart rate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Mean depth @ s</translation> </message> @@ -3281,142 +3304,148 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="463"/> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="479"/> + <location filename="../qt-models/divetripmodel.cpp" line="534"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="466"/> - <location filename="../qt-models/divetripmodel.cpp" line="518"/> + <location filename="../qt-models/divetripmodel.cpp" line="482"/> + <location filename="../qt-models/divetripmodel.cpp" line="537"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="469"/> - <location filename="../qt-models/divetripmodel.cpp" line="521"/> + <location filename="../qt-models/divetripmodel.cpp" line="485"/> + <location filename="../qt-models/divetripmodel.cpp" line="540"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="472"/> + <location filename="../qt-models/divetripmodel.cpp" line="488"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="475"/> - <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="491"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="497"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="484"/> - <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="500"/> + <location filename="../qt-models/divetripmodel.cpp" line="555"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="494"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="487"/> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <location filename="../qt-models/divetripmodel.cpp" line="558"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="490"/> - <location filename="../qt-models/divetripmodel.cpp" line="542"/> + <location filename="../qt-models/divetripmodel.cpp" line="506"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="493"/> + <location filename="../qt-models/divetripmodel.cpp" line="509"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="496"/> - <location filename="../qt-models/divetripmodel.cpp" line="550"/> + <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="569"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="499"/> - <location filename="../qt-models/divetripmodel.cpp" line="553"/> + <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="572"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="518"/> + <location filename="../qt-models/divetripmodel.cpp" line="575"/> + <source>Tags</source> + <translation>Tags</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="521"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="524"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> - <location filename="../qt-models/divetripmodel.cpp" line="559"/> + <location filename="../qt-models/divetripmodel.cpp" line="527"/> + <location filename="../qt-models/divetripmodel.cpp" line="581"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="543"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="543"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="524"/> + <location filename="../qt-models/divetripmodel.cpp" line="543"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <location filename="../qt-models/divetripmodel.cpp" line="549"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="533"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="533"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="533"/> + <location filename="../qt-models/divetripmodel.cpp" line="552"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="547"/> + <location filename="../qt-models/divetripmodel.cpp" line="566"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="547"/> + <location filename="../qt-models/divetripmodel.cpp" line="566"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="556"/> + <location filename="../qt-models/divetripmodel.cpp" line="578"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> @@ -3424,112 +3453,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="41"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> <source>no dives were selected</source> <translation>no dives were selected</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="51"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>stylesheet to export to divelogs.de is not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="61"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> <source>failed to create zip file for upload: %s</source> <translation>failed to create zip file for upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="125"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> <source>internal error</source> <translation>internal error</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="133"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Conversion of dive %1 to divelogs.de format failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="161"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>error writing zip file: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="822"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="741"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="932"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="665"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="775"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="697"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="807"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="738"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="848"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="772"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="882"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="786"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="896"/> <source>Problem with download</source> <translation>Problem with download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="787"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="897"/> <source>The archive could not be opened: </source> <translation>The archive could not be opened: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="796"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="906"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="797"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="907"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="933"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="836"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="946"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="839"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="842"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="845"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="857"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3537,23 +3566,23 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="84"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="85"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="89"/> <source>Choose Bluetooth download mode</source> <translation>Choose Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="122"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="125"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="123"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="126"/> <source>Connecting to dive computer</source> <translation>Connecting to dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="218"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="219"/> <source>Error</source> <translation>Error</translation> </message> @@ -3670,9 +3699,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="185"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> <source>Download</source> <translation>Download</translation> </message> @@ -3698,7 +3727,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="211"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -3713,57 +3742,57 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth is not enabled</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="69"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="57"/> <source> Vendor name: </source> <translation> Vendor name: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="100"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="87"/> <source> Dive Computer:</source> <translation> Dive Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="135"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> <source> Connection:</source> <translation> Connection:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="211"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="225"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="212"/> <source>Rescan</source> <translation>Rescan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="233"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation> Downloaded dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="234"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="274"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="293"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="301"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> @@ -3830,7 +3859,7 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookPlugin</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebook_integration.cpp" line="36"/> + <location filename="../desktop-widgets/plugins/facebook/facebook_integration.cpp" line="35"/> <source>Facebook</source> <translation>Facebook</translation> </message> @@ -3838,17 +3867,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="523"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="521"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="522"/> <source>Invert Selection</source> <translation>Invert Selection</translation> </message> @@ -3902,12 +3931,12 @@ p, li { white-space: pre-wrap; } <context> <name>FirmwareUpdateThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2237"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2233"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2242"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2238"/> <source>Firmware update failed!</source> <translation>Firmware update failed.</translation> </message> @@ -3915,7 +3944,7 @@ p, li { white-space: pre-wrap; } <context> <name>ForwardButton</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="48"/> <source>Navigate Forward</source> <translation>Navigate forward</translation> </message> @@ -3923,7 +3952,7 @@ p, li { white-space: pre-wrap; } <context> <name>GasSelectionModel</name> <message> - <location filename="../qt-models/models.cpp" line="52"/> + <location filename="../qt-models/models.cpp" line="51"/> <source>cyl.</source> <translation>cyl.</translation> </message> @@ -3931,7 +3960,7 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="336"/> <source>Back</source> <translation>Back</translation> </message> @@ -3968,8 +3997,8 @@ p, li { white-space: pre-wrap; } <name>GpsLocation</name> <message> <location filename="../core/gpslocation.cpp" line="135"/> - <source>Unknown GPS location</source> - <translation>Unknown GPS location</translation> + <source>Unknown GPS location (no GPS source)</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3988,7 +4017,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="554"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> <source>Location: </source> <translation>Location: </translation> </message> @@ -3996,32 +4025,32 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="489"/> <source> (same GPS fix)</source> <translation> (same GPS fix)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> <source> (~%1 away</source> <translation> (~%1 away</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="495"/> <source>, %n dive(s) here)</source> <translation><numerusform>, %n dive here)</numerusform><numerusform>, %n dives here)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(no existing GPS data, add GPS fix from this dive)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> <source>(no GPS data)</source> <translation>(no GPS data)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="504"/> <source>Pick site: </source> <translation>Pick site: </translation> </message> @@ -4029,7 +4058,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="338"/> + <location filename="../qt-models/filtermodels.cpp" line="327"/> <source>No location set</source> <translation>No location set</translation> </message> @@ -4095,7 +4124,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationInformationModel</name> <message> - <location filename="../qt-models/divelocationmodel.cpp" line="70"/> + <location filename="../qt-models/divelocationmodel.cpp" line="68"/> <source>Create dive site with this name</source> <translation>Create dive site with this name</translation> </message> @@ -4154,8 +4183,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="534"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -4176,19 +4205,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="568"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> <source>Location</source> <translation>Location</translation> </message> @@ -4273,103 +4302,83 @@ p, li { white-space: pre-wrap; } <translation>Photos</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="82"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="83"/> <source>Apply changes</source> <translation>Apply changes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="86"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="87"/> <source>Discard changes</source> <translation>Discard changes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/> <source>Add cylinder</source> <translation>Add cylinder</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="107"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> <source>Add weight system</source> <translation>Add weight system</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="111"/> - <source>OC</source> - <translation>OC</translation> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="111"/> - <source>CCR</source> - <translation>CCR</translation> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="111"/> - <source>pSCR</source> - <translation>pSCR</translation> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="111"/> - <source>Freedive</source> - <translation>Freedive</translation> - </message> - <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="301"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="340"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="347"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="349"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="478"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="735"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> <source>New dive site</source> <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1030"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1031"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -4428,7 +4437,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="556"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="573"/> <source>Open</source> <translation>Open</translation> </message> @@ -4724,13 +4733,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="240"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="245"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="241"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="246"/> <source>&Redo</source> <translation>&Redo</translation> </message> @@ -4770,79 +4779,72 @@ p, li { white-space: pre-wrap; } <translation>Cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="367"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="397"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="547"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="592"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="570"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="557"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="694"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2022"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="617"/> - <source>Don't save an empty log to the cloud</source> - <translation>Don't save an empty log to the cloud</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="715"/> <source>Traverse image directories</source> <translation>Traverse image directories</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="718"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="701"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="726"/> <source>Scanning images...(this can take a while)</source> <translation>Scanning images...(this can take a while)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="648"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="727"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="893"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1011"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1100"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1106"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="583"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="752"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="585"/> + <location filename="../desktop-widgets/divelistview.cpp" line="584"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Trying to merge dives with %1min interval between them</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="261"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="266"/> <source>Template backup created</source> <translation>Template backup created</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="267"/> <source>The following backup printing templates were created: %1 @@ -4865,220 +4867,214 @@ are read-only and should not be edited directly, since the application can overwrite them on startup.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="648"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <source>Please save or cancel the current dive edit before going online</source> <translation>Please save or cancel the current dive edit before going online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="686"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation>You have unsaved changes. Do you want to commit them to cloud storage now? If you answer no, the cloud will only be synced next time you "Open cloud storage" or "Save to cloud storage".</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="696"/> <source>Failure taking cloud storage online</source> <translation>Failure taking cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="768"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="793"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Please save or cancel the current dive edit before closing the file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="893"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="953"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="967"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1011"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1100"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1106"/> - <source>Trying to edit a dive that's not a manually added dive.</source> - <translation>Trying to edit a dive that's not a manually added dive.</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1153"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> <source>Dive log files</source> <translation>Dive log files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1662"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1395"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> <source>DiveLogs.de</source> <translation>DiveLogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1396"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> <source>MkVI files</source> <translation>MkVI files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> <source>APD log viewer</source> <translation>APD log viewer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> <source>All files</source> <translation>All files</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1422"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1471"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="660"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1428"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1661"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1747"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1749"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1853"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1873"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2022"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -5140,7 +5136,7 @@ The QML modules QtPositioning and QtLocation could be missing!</translation> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="598"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/> <source>Filter shows %1 (of %2) dives</source> <translation>Filter shows %1 (of %2) dives</translation> </message> @@ -5148,12 +5144,12 @@ The QML modules QtPositioning and QtLocation could be missing!</translation> <context> <name>OstcFirmwareCheck</name> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="299"/> <source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source> <translation>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="302"/> <source> If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</source> @@ -5162,27 +5158,27 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa If your device uses Bluetooth, do the same preparations as for a logbook download before continuing with the update</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="307"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="303"/> <source>Not now</source> <translation>Not now</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="308"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="304"/> <source>Update firmware</source> <translation>Update firmware</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="310"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="306"/> <source>Firmware upgrade notice</source> <translation>Firmware upgrade notice</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="328"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="324"/> <source>Save the downloaded firmware as</source> <translation>Save the downloaded firmware as</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="325"/> <source>Firmware files</source> <translation>Firmware files</translation> </message> @@ -5191,16 +5187,22 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <name>Page1Form.ui</name> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> + <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="26"/> + <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="26"/> <source>Page 1</source> <translation>Page 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> + <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="37"/> + <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="44"/> <source>Text Field</source> <translation>Text field</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> + <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/Page1Form.ui.qml" line="42"/> + <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/Page1Form.ui.qml" line="49"/> <source>Press Me</source> <translation>Press me</translation> </message> @@ -5208,89 +5210,74 @@ 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="449"/> - <source>Open circuit</source> - <translation>Open circuit</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> - <source>CCR</source> - <translation>CCR</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="449"/> - <source>pSCR</source> - <translation>pSCR</translation> - </message> - <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="540"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="542"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="541"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="543"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="542"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="544"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="543"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="545"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="544"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="546"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="546"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="548"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="547"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="549"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="548"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="550"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="549"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="551"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="550"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="552"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="553"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="554"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="555"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="556"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="562"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="563"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="564"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="565"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="572"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="574"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="577"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="579"/> <source>psi</source> <translation>psi</translation> </message> @@ -5393,17 +5380,17 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Reset all settings to their default value</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="10"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="9"/> <source>General</source> <translation>General</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> <source>Open default log file</source> <translation>Open default log file</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> + <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="22"/> <source>Subsurface files</source> <translation>Subsurface files</translation> </message> @@ -5450,57 +5437,47 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>CCR options:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/> - <source>Show setpoints when viewing pO₂</source> - <translation>Show setpoints when viewing pO₂</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/> - <source>Show individual O₂ sensor values when viewing pO₂</source> - <translation>Show individual O₂ sensor values when viewing pO₂</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="185"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="239"/> <source>Ceiling display setup</source> <translation>Ceiling display setup</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="290"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> <source>Draw dive computer reported ceiling red</source> <translation>Draw dive computer reported ceiling red</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="224"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="268"/> <source>Algorithm for calculated ceiling:</source> <translation>Algorithm for calculated ceiling:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="264"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="298"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="191"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="245"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="341"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="327"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/> <source>pSCR options:</source> <translation>pSCR options:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="231"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="202"/> <source>Dilution ratio</source> <translation>Dilution ratio</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="204"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="215"/> <source>1:</source> <translation>1:</translation> </message> @@ -5540,53 +5517,73 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Dive planner default setpoint</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="175"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="161"/> + <source>Show O₂ sensor values when viewing pO₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="168"/> + <source>Show CCR setpoints when viewing pO₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="182"/> + <source>pSCR metabolic rate O₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="222"/> + <source>Show equivalent OC pO₂ with pSCR pO₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="229"/> <source>Show warnings for isobaric counterdiffusion</source> <translation>Show warnings for isobaric counterdiffusion</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="288"/> <source>Conservatism level</source> <translation>Conservatism level</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="211"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="374"/> + <source>Recalculate thumbnails if older than image</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="255"/> <source>B&ühlmann</source> <translation>B&ühlmann</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="297"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="192"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="241"/> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="275"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="328"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> - <source>Metabolic rate O₂</source> - <translation>Metabolic rate O₂</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> <source>&VPM-B</source> <translation>&VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="354"/> <source>Misc</source> <translation>Misc</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> <source>Show unused cylinders in Equipment tab</source> <translation>Show unused cylinders in Equipment tab</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="367"/> <source>Show mean depth in Profile</source> <translation>Show mean depth in Profile</translation> </message> @@ -5742,7 +5739,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="145"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="144"/> <source>Subsurface cloud storage</source> <translation>Subsurface cloud storage</translation> </message> @@ -5782,58 +5779,58 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Save user ID locally?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/> <source>Network</source> <translation>Network</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/> <source>No proxy</source> <translation>No proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/> <source>System proxy</source> <translation>System proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/> <source>HTTP proxy</source> <translation>HTTP proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/> <source>SOCKS proxy</source> <translation>SOCKS proxy</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="71"/> <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="76"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/> <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="99"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="113"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="98"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="112"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="138"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface cloud storage (credentials verified)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="141"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="140"/> <source>Subsurface cloud storage (incorrect password)</source> <translation>Subsurface cloud storage (incorrect password)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="143"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="142"/> <source>Subsurface cloud storage (PIN required)</source> <translation>Subsurface cloud storage (PIN required)</translation> </message> @@ -6162,123 +6159,128 @@ Please export this template to a different file.</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="768"/> + <location filename="../profile-widget/profilewidget2.cpp" line="789"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="764"/> + <location filename="../profile-widget/profilewidget2.cpp" line="785"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="789"/> + <location filename="../profile-widget/profilewidget2.cpp" line="813"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1391"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1415"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1377"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Make first dive computer</source> <translation>Make default dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="760"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source>Planned dive</source> <translation>Planned dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="762"/> + <location filename="../profile-widget/profilewidget2.cpp" line="783"/> <source>Manually added dive</source> <translation>Manually added dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1379"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1403"/> <source>Delete this dive computer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1394"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1400"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> <source>Add setpoint change</source> <translation>Add setpoint change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1406"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1436"/> + <source>Change divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1460"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1415"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1422"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1476"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1453"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1460"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1507"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1514"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation>Adjust pressure of cyl. %1 (currently interpolated as %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1564"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1564"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1545"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1599"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1546"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1669"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1737"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1670"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1675"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1743"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -6286,152 +6288,159 @@ Please export this template to a different file.</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="168"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="325"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="177"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="225"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="239"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="257"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="354"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="353"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="358"/> <source>Error parsing local storage, giving up</source> <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="362"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="367"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="402"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="409"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="408"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="415"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Attempting to open cloud storage with new credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="483"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/> <source>No response from cloud server to validate the credentials</source> <translation>No response from cloud server to validate the credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="505"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Cannot connect to cloud storage - cloud account not verified</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Cannot open cloud storage: Error creating https connection</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="562"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="579"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="586"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="603"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="596"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="613"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="653"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="681"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="698"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="706"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="723"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud storage open successfully. No dives in dive list.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="901"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="881"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="901"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="902"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1315"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> </context> <context> + <name>QMLPrefs</name> + <message> + <location filename="../mobile-widgets/qmlprefs.cpp" line="186"/> + <source>Starting...</source> + <translation>Starting...</translation> + </message> +</context> +<context> <name>QObject</name> <message> <location filename="../core/gpslocation.h" line="14"/> @@ -6439,79 +6448,79 @@ Please export this template to a different file.</translation> <translation>Waiting to aquire GPS location</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="774"/> - <location filename="../core/qthelper.cpp" line="1315"/> + <location filename="../core/qthelper.cpp" line="766"/> + <location filename="../core/qthelper.cpp" line="1331"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="776"/> - <location filename="../core/qthelper.cpp" line="1314"/> + <location filename="../core/qthelper.cpp" line="768"/> + <location filename="../core/qthelper.cpp" line="1330"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="802"/> + <location filename="../core/qthelper.cpp" line="794"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="804"/> + <location filename="../core/qthelper.cpp" line="796"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="829"/> - <location filename="../core/qthelper.cpp" line="1290"/> + <location filename="../core/qthelper.cpp" line="821"/> + <location filename="../core/qthelper.cpp" line="1306"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="831"/> - <location filename="../core/qthelper.cpp" line="1291"/> + <location filename="../core/qthelper.cpp" line="823"/> + <location filename="../core/qthelper.cpp" line="1307"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="856"/> - <location filename="../core/qthelper.cpp" line="1340"/> + <location filename="../core/qthelper.cpp" line="848"/> + <location filename="../core/qthelper.cpp" line="1356"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="858"/> - <location filename="../core/qthelper.cpp" line="1339"/> + <location filename="../core/qthelper.cpp" line="850"/> + <location filename="../core/qthelper.cpp" line="1355"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="879"/> - <location filename="../core/qthelper.cpp" line="1275"/> + <location filename="../core/qthelper.cpp" line="871"/> + <location filename="../core/qthelper.cpp" line="1283"/> <source>AIR</source> <translation>AIR</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="881"/> + <location filename="../core/qthelper.cpp" line="873"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1019"/> + <location filename="../core/qthelper.cpp" line="1011"/> <source>(%n dive(s))</source> <translation><numerusform>(%n dive)</numerusform><numerusform>(%n dives)</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1275"/> + <location filename="../core/qthelper.cpp" line="1283"/> <source>OXYGEN</source> <translation>OXYGEN</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1362"/> + <location filename="../core/qthelper.cpp" line="1378"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1363"/> + <location filename="../core/qthelper.cpp" line="1379"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -6524,7 +6533,7 @@ Please export this template to a different file.</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>min</source> <translation>min</translation> </message> @@ -6532,15 +6541,15 @@ Please export this template to a different file.</translation> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="132"/> - <location filename="../desktop-widgets/templatelayout.h" line="111"/> + <location filename="../desktop-widgets/templatelayout.h" line="110"/> <source>h</source> <translation>h</translation> </message> <message> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> - <location filename="../core/helpers.h" line="41"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../core/qthelper.h" line="79"/> + <location filename="../desktop-widgets/templatelayout.h" line="111"/> <source>sec</source> <translation>sec</translation> </message> @@ -6550,37 +6559,37 @@ Please export this template to a different file.</translation> <translation>Remove this point</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="34"/> <source>Average</source> <translation>Average</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="37"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="41"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="40"/> <source>Maximum</source> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="512"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="623"/> <source>Invalid response from server</source> <translation>Invalid response from server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="520"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="677"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Expected XML tag 'DiveDates' not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="573"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="684"/> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> @@ -6594,19 +6603,24 @@ Please export this template to a different file.</translation> <source>Tags</source> <translation>Tags</translation> </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <source>Don't save an empty log to the cloud</source> + <translation>Don't save an empty log to the cloud</translation> + </message> </context> <context> <name>ReadSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2134"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2159"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2130"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2155"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2136"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2145"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2156"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2132"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2141"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2152"/> <source>Failed!</source> <translation>Failed!</translation> </message> @@ -6625,22 +6639,22 @@ Please export this template to a different file.</translation> </message> <message> <location filename="../desktop-widgets/renumber.ui" line="61"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="151"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="149"/> <source>New starting number</source> <translation>New starting number</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="149"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="147"/> <source>New number</source> <translation>New number</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="154"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="152"/> <source>Renumber selected dives</source> <translation>Renumber selected dives</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="156"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="154"/> <source>Renumber all dives</source> <translation>Renumber all dives</translation> </message> @@ -6648,7 +6662,7 @@ Please export this template to a different file.</translation> <context> <name>ResetSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2262"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2258"/> <source>Reset settings failed!</source> <translation>Reset settings failed</translation> </message> @@ -6727,81 +6741,71 @@ Please export this template to a different file.</translation> <translation>Not applicable</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="54"/> <source>Change</source> <translation>Change</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="61"/> <source>Status</source> <translation>Status</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="86"/> <source>Theme</source> <translation>Theme</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="94"/> <source>Blue</source> <translation>Blue</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="109"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="161"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="214"/> <source>regular text</source> <translation>regular text</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="124"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="176"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="229"/> <source>Highlight</source> <translation>Highlight</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="147"/> <source>Pink</source> <translation>Pink</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="199"/> <source>Dark</source> <translation>Dark</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="263"/> <source>Subsurface GPS data webservice</source> <translation>Subsurface GPS data webservice</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="272"/> <source>Distance threshold (meters)</source> <translation>Distance threshold (meters)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="288"/> <source>Time threshold (minutes)</source> <translation>Time threshold (minutes)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> - <source>Dive computer</source> - <translation>Dive computer</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> - <source>Save detailed log</source> - <translation>Save detailed log</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="346"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="315"/> <source>Developer</source> <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="355"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="324"/> <source>Display Developer menu</source> <translation>Display developer menu</translation> </message> @@ -6868,39 +6872,39 @@ Not all images have timestamps in the range between <translation>Which date and time are displayed on the image?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="310"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="307"/> <source>Open image file</source> <translation>Open image file</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="312"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> <source>Image files</source> <translation>Image files</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> <source>Selected dive date/time</source> <translation>Selected dive date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>First selected dive date/time</source> <translation>First selected dive date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="392"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="389"/> <source>Last selected dive date/time</source> <translation>Last selected dive date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="394"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> <source> Files with inappropriate date/time</source> <translation> Files with inappropriate date/time</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="404"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="401"/> <source>No Exif date/time found</source> <translation>No Exif date/time found</translation> </message> @@ -7173,8 +7177,8 @@ Files with inappropriate date/time</translation> <name>StartPage</name> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="37"/> - <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> - <translation>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is your first time using Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud button above.</translation> + <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud button above.</source> + <translation type="unfinished"/> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="50"/> @@ -7218,47 +7222,47 @@ Files with inappropriate date/time</translation> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="284"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> <source>Enter User ID and click Download</source> <translation>Enter User ID and click download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="308"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="503"/> <source>Connecting...</source> <translation>Connecting...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="411"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="522"/> <source>Download finished</source> <translation>Download finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="425"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> <source>Download error: %1</source> <translation>Download error: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="546"/> <source>Connection error: </source> <translation>Connection error: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="438"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> <source>Invalid user identifier!</source> <translation>Invalid user identifier.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="441"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> <source>Cannot parse response!</source> <translation>Cannot parse response.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="444"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> <source>Download successful</source> <translation>Download successful</translation> </message> @@ -7266,7 +7270,7 @@ Files with inappropriate date/time</translation> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="559"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> <source>Suits: </source> <translation>Suits: </translation> </message> @@ -7274,7 +7278,7 @@ Files with inappropriate date/time</translation> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="172"/> + <location filename="../qt-models/filtermodels.cpp" line="170"/> <source>No suit set</source> <translation>No suit set</translation> </message> @@ -7365,29 +7369,29 @@ Files with inappropriate date/time</translation> <translation>Water type</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="72"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> <source>d</source> <translation>d</translation> </message> @@ -7405,32 +7409,37 @@ Files with inappropriate date/time</translation> <translation>Zoom level</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> <source>Load image(s) from file(s)</source> <translation>Load image(s) from file(s)</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="53"/> <source>Load image(s) from web</source> <translation>Load image(s) from web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> <source>Delete selected images</source> <translation>Delete selected images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="56"/> <source>Delete all images</source> <translation>Delete all images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="57"/> + <source>Recalculate selected thumbnails</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> <source>Deleting Images</source> <translation>Deleting Images</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="104"/> <source>Are you sure you want to delete all images?</source> <translation>Are you sure you want to delete all images?</translation> </message> @@ -7600,7 +7609,7 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="543"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/> <source>Tags: </source> <translation>Tags: </translation> </message> @@ -7608,7 +7617,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="197"/> + <location filename="../qt-models/filtermodels.cpp" line="195"/> <source>Empty tags</source> <translation>Empty tags</translation> </message> @@ -7616,17 +7625,17 @@ mixed from Air and using: <context> <name>TankInfoModel</name> <message> - <location filename="../qt-models/tankinfomodel.cpp" line="95"/> + <location filename="../qt-models/tankinfomodel.cpp" line="92"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-models/tankinfomodel.cpp" line="95"/> + <location filename="../qt-models/tankinfomodel.cpp" line="92"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-models/tankinfomodel.cpp" line="95"/> + <location filename="../qt-models/tankinfomodel.cpp" line="92"/> <source>bar</source> <translation>bar</translation> </message> @@ -7799,7 +7808,7 @@ mixed from Air and using: <translation>colour6</translation> </message> <message> - <location filename="../desktop-widgets/templateedit.cpp" line="141"/> + <location filename="../desktop-widgets/templateedit.cpp" line="142"/> <source>Do you want to save your changes?</source> <translation>Do you want to save your changes?</translation> </message> @@ -7807,15 +7816,23 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="683"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="680"/> <source>%1click to visit %2</source> <translation>%1click to visit %2</translation> </message> </context> <context> + <name>ToolBarApplicationHeader</name> + <message> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ToolBarApplicationHeader.qml" line="125"/> + <source>More Actions</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ToolTipItem</name> <message> - <location filename="../profile-widget/divetooltipitem.cpp" line="138"/> + <location filename="../profile-widget/divetooltipitem.cpp" line="137"/> <source>Information</source> <translation>Information</translation> </message> @@ -7823,125 +7840,130 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="72"/> + <location filename="../qt-models/divetripmodel.cpp" line="73"/> <source>(%1 shown)</source> <translation>(%1 shown)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="235"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="238"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="241"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="244"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="244"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="244"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="247"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="250"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="259"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="273"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="365"/> + <location filename="../qt-models/divetripmodel.cpp" line="276"/> + <source>Tags</source> + <translation>Tags</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="375"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="365"/> + <location filename="../qt-models/divetripmodel.cpp" line="375"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="419"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> + <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="419"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="256"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="255"/> + <location filename="../qt-models/divetripmodel.cpp" line="262"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="267"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> - <location filename="../qt-models/divetripmodel.cpp" line="399"/> + <location filename="../qt-models/divetripmodel.cpp" line="267"/> + <location filename="../qt-models/divetripmodel.cpp" line="409"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="270"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="279"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="282"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="275"/> + <location filename="../qt-models/divetripmodel.cpp" line="285"/> <source>Location</source> <translation>Location</translation> </message> @@ -7962,74 +7984,74 @@ mixed from Air and using: <context> <name>UpdateManager</name> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="61"/> <source>Check for updates.</source> <translation>Check for updates.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="63"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="62"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface was unable to check for updates.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="67"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="69"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="68"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="79"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="78"/> <source>You are using the latest version of Subsurface.</source> <translation>You are using the latest version of Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="82"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="81"/> <source>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>A new version of Subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="87"/> <source>A new version of Subsurface is available.</source> <translation>A new version of Subsurface is available.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="89"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="88"/> <source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source> <translation>Latest version is %1, please check %2 our download page %3 for information in how to update.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="98"/> <source>Newest release version is </source> <translation>Newest release version is </translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="100"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="99"/> <source>The server returned the following information:</source> <translation>The server returned the following information:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="116"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Subsurface checks every two weeks to see if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> <source>Decline</source> <translation>Decline</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> <source>Automatic check for updates</source> <translation>Automatic check for updates</translation> </message> @@ -8207,12 +8229,12 @@ Language: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-models/weigthsysteminfomodel.cpp" line="84"/> + <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-models/weigthsysteminfomodel.cpp" line="84"/> + <location filename="../qt-models/weightsysteminfomodel.cpp" line="81"/> <source>kg</source> <translation>kg</translation> </message> @@ -8260,12 +8282,12 @@ Language: %1</translation> <translation>Upload</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="213"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> <source>Operation timed out</source> <translation>Operation timed out</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="234"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> <source>Transferring data...</source> <translation>Transferring data...</translation> </message> @@ -8300,15 +8322,15 @@ Language: %1</translation> <context> <name>WriteSettingsThread</name> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2183"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2208"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2179"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2204"/> <source>This feature is not yet available for the selected dive computer.</source> <translation>This feature is not yet available for the selected dive computer.</translation> </message> <message> - <location filename="../core/configuredivecomputerthreads.cpp" line="2185"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2196"/> - <location filename="../core/configuredivecomputerthreads.cpp" line="2205"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2181"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2192"/> + <location filename="../core/configuredivecomputerthreads.cpp" line="2201"/> <source>Failed!</source> <translation>Failed!</translation> </message> @@ -8316,17 +8338,17 @@ Language: %1</translation> <context> <name>YearStatisticsItem</name> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="63"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="62"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="63"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="62"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="63"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="62"/> <source>sec</source> <translation>sec</translation> </message> @@ -8334,79 +8356,79 @@ Language: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="126"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="125"/> <source>Year > Month / Trip</source> <translation>Year > Month / Trip</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="129"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="128"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="132"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="131"/> <source>Duration Total</source> <translation>Duration Total</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="135"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="134"/> <source> Average</source> <translation> Average</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="138"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="137"/> <source> Shortest</source> <translation> Shortest</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="141"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="140"/> <source> Longest</source> <translation> Longest</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="144"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="143"/> <source>Depth (%1) Average</source> <translation>Depth (%1) Average</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="147"/> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="156"/> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="165"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="146"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="155"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="164"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="150"/> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="159"/> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="168"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="149"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="158"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="167"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="153"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="152"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Average</translation> </message> <message> - <location filename="../qt-models/yearlystatisticsmodel.cpp" line="162"/> + <location filename="../qt-models/yearlystatisticsmodel.cpp" line="161"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -8416,7 +8438,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="792"/> + <location filename="../core/libdivecomputer.c" line="810"/> <source>Error parsing the header</source> <translation>Error parsing the header</translation> </message> @@ -8424,74 +8446,74 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../core/cochran.c" line="304"/> - <location filename="../core/cochran.c" line="310"/> - <location filename="../core/cochran.c" line="380"/> - <location filename="../core/libdivecomputer.c" line="250"/> + <location filename="../core/cochran.c" line="305"/> + <location filename="../core/cochran.c" line="311"/> + <location filename="../core/cochran.c" line="381"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>deco stop</source> <translation>deco stop</translation> </message> <message> - <location filename="../core/cochran.c" line="331"/> - <location filename="../core/cochran.c" line="385"/> - <location filename="../core/import-csv.c" line="682"/> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/cochran.c" line="332"/> + <location filename="../core/cochran.c" line="386"/> + <location filename="../core/import-csv.c" line="683"/> + <location filename="../core/libdivecomputer.c" line="260"/> <source>ascent</source> <translation>ascent</translation> </message> <message> - <location filename="../core/cochran.c" line="337"/> - <location filename="../core/import-csv.c" line="660"/> + <location filename="../core/cochran.c" line="338"/> + <location filename="../core/import-csv.c" line="661"/> <source>battery</source> <translation>battery</translation> </message> <message> - <location filename="../core/cochran.c" line="343"/> - <location filename="../core/libdivecomputer.c" line="268"/> + <location filename="../core/cochran.c" line="344"/> + <location filename="../core/libdivecomputer.c" line="276"/> <source>OLF</source> <translation>OLF</translation> </message> <message> - <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="267"/> + <location filename="../core/cochran.c" line="349"/> + <location filename="../core/libdivecomputer.c" line="275"/> <source>maxdepth</source> <translation>maxdepth</translation> </message> <message> - <location filename="../core/cochran.c" line="353"/> - <location filename="../core/cochran.c" line="399"/> - <location filename="../core/libdivecomputer.c" line="269"/> + <location filename="../core/cochran.c" line="354"/> + <location filename="../core/cochran.c" line="400"/> + <location filename="../core/libdivecomputer.c" line="277"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../core/cochran.c" line="360"/> - <location filename="../core/cochran.c" line="409"/> - <location filename="../core/cochran.c" line="416"/> - <location filename="../core/import-csv.c" line="763"/> - <location filename="../core/libdivecomputer.c" line="260"/> - <location filename="../core/libdivecomputer.c" line="274"/> - <location filename="../core/plannernotes.c" line="52"/> + <location filename="../core/cochran.c" line="361"/> + <location filename="../core/cochran.c" line="410"/> + <location filename="../core/cochran.c" line="417"/> + <location filename="../core/import-csv.c" line="764"/> + <location filename="../core/libdivecomputer.c" line="268"/> + <location filename="../core/libdivecomputer.c" line="282"/> + <location filename="../core/plannernotes.c" line="50"/> <source>gaschange</source> <translation>gas change</translation> </message> <message> - <location filename="../core/cochran.c" line="365"/> - <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/cochran.c" line="366"/> + <location filename="../core/cochran.c" line="405"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>rbt</source> <translation>rbt</translation> </message> <message> - <location filename="../core/cochran.c" line="374"/> - <location filename="../core/cochran.c" line="421"/> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/cochran.c" line="375"/> + <location filename="../core/cochran.c" line="422"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../core/cochran.c" line="390"/> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/cochran.c" line="391"/> + <location filename="../core/libdivecomputer.c" line="263"/> <source>transmitter</source> <translation>transmitter</translation> </message> @@ -8562,7 +8584,7 @@ Maximum</translation> </message> <message> <location filename="../core/datatrak.c" line="371"/> - <location filename="../core/dive.c" line="31"/> + <location filename="../core/dive.c" line="32"/> <source>deco</source> <translation>deco</translation> </message> @@ -8577,7 +8599,7 @@ Maximum</translation> <translation>multiple ascent</translation> </message> <message> - <location filename="../core/dive.c" line="29"/> + <location filename="../core/dive.c" line="30"/> <source>fresh</source> <translation>fresh</translation> </message> @@ -8603,7 +8625,7 @@ Maximum</translation> </message> <message> <location filename="../core/datatrak.c" line="408"/> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/dive.c" line="31"/> <source>instructor</source> <translation>instructor</translation> </message> @@ -8614,19 +8636,19 @@ Maximum</translation> </message> <message> <location filename="../core/datatrak.c" line="412"/> - <location filename="../core/dive.c" line="29"/> + <location filename="../core/dive.c" line="30"/> <source>night</source> <translation>night</translation> </message> <message> <location filename="../core/datatrak.c" line="414"/> - <location filename="../core/dive.c" line="27"/> + <location filename="../core/dive.c" line="28"/> <source>cave</source> <translation>cave</translation> </message> <message> <location filename="../core/datatrak.c" line="416"/> - <location filename="../core/dive.c" line="26"/> + <location filename="../core/dive.c" line="27"/> <source>ice</source> <translation>ice</translation> </message> @@ -8637,25 +8659,25 @@ Maximum</translation> </message> <message> <location filename="../core/datatrak.c" line="427"/> - <location filename="../core/dive.c" line="27"/> + <location filename="../core/dive.c" line="28"/> <source>wreck</source> <translation>wreck</translation> </message> <message> <location filename="../core/datatrak.c" line="429"/> - <location filename="../core/dive.c" line="28"/> + <location filename="../core/dive.c" line="29"/> <source>river</source> <translation>river</translation> </message> <message> <location filename="../core/datatrak.c" line="431"/> - <location filename="../core/dive.c" line="25"/> + <location filename="../core/dive.c" line="26"/> <source>drift</source> <translation>drift</translation> </message> <message> <location filename="../core/datatrak.c" line="433"/> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/dive.c" line="31"/> <source>photo</source> <translation>photo</translation> </message> @@ -8697,156 +8719,161 @@ Maximum</translation> <translation>Error: no dive</translation> </message> <message> - <location filename="../core/dive.c" line="25"/> + <location filename="../core/dive.c" line="26"/> <source>boat</source> <translation>boat</translation> </message> <message> - <location filename="../core/dive.c" line="25"/> + <location filename="../core/dive.c" line="26"/> <source>shore</source> <translation>shore</translation> </message> <message> - <location filename="../core/dive.c" line="26"/> + <location filename="../core/dive.c" line="27"/> <source>deep</source> <translation>deep</translation> </message> <message> - <location filename="../core/dive.c" line="26"/> + <location filename="../core/dive.c" line="27"/> <source>cavern</source> <translation>cavern</translation> </message> <message> - <location filename="../core/dive.c" line="27"/> + <location filename="../core/dive.c" line="28"/> <source>altitude</source> <translation>altitude</translation> </message> <message> - <location filename="../core/dive.c" line="28"/> + <location filename="../core/dive.c" line="29"/> <source>pool</source> <translation>pool</translation> </message> <message> - <location filename="../core/dive.c" line="28"/> + <location filename="../core/dive.c" line="29"/> <source>lake</source> <translation>lake</translation> </message> <message> - <location filename="../core/dive.c" line="29"/> + <location filename="../core/dive.c" line="30"/> <source>student</source> <translation>student</translation> </message> <message> - <location filename="../core/dive.c" line="30"/> + <location filename="../core/dive.c" line="31"/> <source>video</source> <translation>video</translation> </message> <message> - <location filename="../core/dive.c" line="35"/> + <location filename="../core/dive.c" line="36"/> <source>OC-gas</source> <translation>OC-gas</translation> </message> <message> - <location filename="../core/dive.c" line="35"/> + <location filename="../core/dive.c" line="36"/> <source>diluent</source> <translation>diluent</translation> </message> <message> - <location filename="../core/dive.c" line="35"/> + <location filename="../core/dive.c" line="36"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1146"/> - <location filename="../core/planner.c" line="1149"/> + <location filename="../core/planner.c" line="1166"/> + <location filename="../core/planner.c" line="1169"/> <source>oxygen</source> <translation>oxygen</translation> </message> <message> - <location filename="../core/dive.c" line="35"/> + <location filename="../core/dive.c" line="36"/> <source>not used</source> <translation>unused</translation> </message> <message> - <location filename="../core/dive.c" line="266"/> + <location filename="../core/dive.c" line="41"/> + <source>Open circuit</source> + <translation>Open circuit</translation> + </message> + <message> + <location filename="../core/dive.c" line="295"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../core/dive.c" line="271"/> - <location filename="../core/plannernotes.c" line="73"/> - <location filename="../core/plannernotes.c" line="74"/> - <location filename="../core/plannernotes.c" line="75"/> - <location filename="../core/qthelper.cpp" line="650"/> + <location filename="../core/dive.c" line="300"/> + <location filename="../core/plannernotes.c" line="68"/> + <location filename="../core/plannernotes.c" line="69"/> + <location filename="../core/plannernotes.c" line="70"/> + <location filename="../core/qthelper.cpp" line="656"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../core/dive.c" line="275"/> - <location filename="../core/qthelper.cpp" line="653"/> + <location filename="../core/dive.c" line="304"/> + <location filename="../core/qthelper.cpp" line="659"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/dive.c" line="312"/> + <location filename="../core/dive.c" line="341"/> <source>ℓ</source> <translation>ℓ</translation> </message> <message> - <location filename="../core/dive.c" line="317"/> + <location filename="../core/dive.c" line="346"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../core/dive.c" line="358"/> - <location filename="../core/qthelper.cpp" line="566"/> - <location filename="../core/qthelper.cpp" line="581"/> + <location filename="../core/dive.c" line="387"/> + <location filename="../core/qthelper.cpp" line="572"/> + <location filename="../core/qthelper.cpp" line="587"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../core/dive.c" line="363"/> - <location filename="../core/qthelper.cpp" line="569"/> - <location filename="../core/qthelper.cpp" line="583"/> + <location filename="../core/dive.c" line="392"/> + <location filename="../core/qthelper.cpp" line="575"/> + <location filename="../core/qthelper.cpp" line="589"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../core/dive.c" line="386"/> + <location filename="../core/dive.c" line="415"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../core/dive.c" line="388"/> + <location filename="../core/dive.c" line="417"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../core/dive.c" line="393"/> + <location filename="../core/dive.c" line="422"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../core/dive.c" line="395"/> + <location filename="../core/dive.c" line="424"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../core/dive.c" line="414"/> - <location filename="../core/qthelper.cpp" line="592"/> - <location filename="../core/qthelper.cpp" line="602"/> + <location filename="../core/dive.c" line="443"/> + <location filename="../core/qthelper.cpp" line="598"/> + <location filename="../core/qthelper.cpp" line="608"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../core/dive.c" line="418"/> - <location filename="../core/qthelper.cpp" line="590"/> - <location filename="../core/qthelper.cpp" line="600"/> + <location filename="../core/dive.c" line="447"/> + <location filename="../core/qthelper.cpp" line="596"/> + <location filename="../core/qthelper.cpp" line="606"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../core/divelist.c" line="672"/> + <location filename="../core/divelist.c" line="683"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1142"/> - <location filename="../core/planner.c" line="1145"/> + <location filename="../core/planner.c" line="1162"/> + <location filename="../core/planner.c" line="1165"/> <source>air</source> <translation>air</translation> </message> @@ -8881,398 +8908,398 @@ Maximum</translation> <translation>clip-on</translation> </message> <message> - <location filename="../core/file.c" line="113"/> + <location filename="../core/file.c" line="115"/> <source>No dives in the input file '%s'</source> <translation>No dives in the input file '%s'</translation> </message> <message> - <location filename="../core/file.c" line="321"/> - <location filename="../core/import-csv.c" line="115"/> - <location filename="../core/import-csv.c" line="360"/> - <location filename="../core/import-csv.c" line="501"/> - <location filename="../core/import-csv.c" line="839"/> - <location filename="../core/ostctools.c" line="49"/> + <location filename="../core/file.c" line="323"/> + <location filename="../core/import-csv.c" line="116"/> + <location filename="../core/import-csv.c" line="361"/> + <location filename="../core/import-csv.c" line="502"/> + <location filename="../core/import-csv.c" line="840"/> + <location filename="../core/ostctools.c" line="50"/> <source>Failed to read '%s'</source> <translation>Failed to read '%s'</translation> </message> <message> - <location filename="../core/file.c" line="208"/> + <location filename="../core/file.c" line="210"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Cannot open CSV file %s; please use Import log file dialog</translation> </message> <message> - <location filename="../core/file.c" line="323"/> + <location filename="../core/file.c" line="325"/> <source>Empty file '%s'</source> <translation>Empty file '%s'</translation> </message> <message> - <location filename="../core/import-csv.c" line="599"/> + <location filename="../core/import-csv.c" line="600"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import failed: unable to read '%s'</translation> </message> <message> - <location filename="../core/import-csv.c" line="635"/> + <location filename="../core/import-csv.c" line="636"/> <source>Mouth piece position OC</source> <translation>Mouth piece position OC</translation> </message> <message> - <location filename="../core/import-csv.c" line="639"/> + <location filename="../core/import-csv.c" line="640"/> <source>Mouth piece position CC</source> <translation>Mouth piece position CC</translation> </message> <message> - <location filename="../core/import-csv.c" line="643"/> + <location filename="../core/import-csv.c" line="644"/> <source>Mouth piece position unknown</source> <translation>Mouth piece position unknown</translation> </message> <message> - <location filename="../core/import-csv.c" line="647"/> + <location filename="../core/import-csv.c" line="648"/> <source>Mouth piece position not connected</source> <translation>Mouth piece position not connected</translation> </message> <message> - <location filename="../core/import-csv.c" line="654"/> + <location filename="../core/import-csv.c" line="655"/> <source>Power off</source> <translation>Power off</translation> </message> <message> - <location filename="../core/import-csv.c" line="704"/> + <location filename="../core/import-csv.c" line="705"/> <source>O₂ calibration failed</source> <translation>O₂ calibration failed</translation> </message> <message> - <location filename="../core/import-csv.c" line="706"/> - <location filename="../core/import-csv.c" line="715"/> + <location filename="../core/import-csv.c" line="707"/> + <location filename="../core/import-csv.c" line="716"/> <source>O₂ calibration</source> <translation>O₂ calibration</translation> </message> <message> - <location filename="../core/import-csv.c" line="234"/> + <location filename="../core/import-csv.c" line="235"/> <source>No dive profile found from '%s'</source> <translation>No dive profile found from '%s'</translation> </message> <message> - <location filename="../core/git-access.c" line="56"/> + <location filename="../core/git-access.c" line="73"/> <source>Checkout from storage (%lu/%lu)</source> <translation>Checkout from storage (%lu/%lu)</translation> </message> <message> - <location filename="../core/git-access.c" line="87"/> + <location filename="../core/git-access.c" line="104"/> <source>Transfer from storage (%d/%d)</source> <translation>Transfer from storage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="99"/> + <location filename="../core/git-access.c" line="116"/> <source>Transfer to storage (%d/%d)</source> <translation>Transfer to storage (%d/%d)</translation> </message> <message> - <location filename="../core/git-access.c" line="135"/> + <location filename="../core/git-access.c" line="152"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="158"/> - <location filename="../core/git-access.c" line="178"/> + <location filename="../core/git-access.c" line="175"/> + <location filename="../core/git-access.c" line="195"/> <source>Could not update local cache to newer remote data</source> <translation>Could not update local cache to newer remote data</translation> </message> <message> - <location filename="../core/git-access.c" line="171"/> + <location filename="../core/git-access.c" line="188"/> <source>Subsurface cloud storage corrupted</source> <translation>Subsurface cloud storage corrupted</translation> </message> <message> - <location filename="../core/git-access.c" line="307"/> + <location filename="../core/git-access.c" line="324"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Could not update Subsurface cloud storage, try again later</translation> </message> <message> - <location filename="../core/git-access.c" line="367"/> + <location filename="../core/git-access.c" line="384"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Remote storage and local data diverged. Error: merge failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="397"/> + <location filename="../core/git-access.c" line="414"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Remote storage and local data diverged. Cannot combine local and remote changes</translation> </message> <message> - <location filename="../core/git-access.c" line="431"/> + <location filename="../core/git-access.c" line="448"/> <source>Remote storage and local data diverged</source> <translation>Remote storage and local data diverged</translation> </message> <message> - <location filename="../core/git-access.c" line="434"/> + <location filename="../core/git-access.c" line="451"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Remote storage and local data diverged. Error: writing the data failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="443"/> + <location filename="../core/git-access.c" line="460"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Problems with local cache of Subsurface cloud data</translation> </message> <message> - <location filename="../core/git-access.c" line="444"/> + <location filename="../core/git-access.c" line="461"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Moved cache data to %s. Please try the operation again.</translation> </message> <message> - <location filename="../core/git-access.c" line="491"/> + <location filename="../core/git-access.c" line="508"/> <source>Update local storage to match cloud storage</source> <translation>Update local storage to match cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="499"/> + <location filename="../core/git-access.c" line="516"/> <source>Push local changes to cloud storage</source> <translation>Push local changes to cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="517"/> + <location filename="../core/git-access.c" line="534"/> <source>Try to merge local changes into cloud storage</source> <translation>Try to merge local changes into cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="559"/> + <location filename="../core/git-access.c" line="576"/> <source>Store data into cloud storage</source> <translation>Store data into cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="583"/> + <location filename="../core/git-access.c" line="600"/> <source>Sync with cloud storage</source> <translation>Sync with cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="610"/> + <location filename="../core/git-access.c" line="627"/> <source>Can't reach cloud server, working with local data</source> <translation>Can't reach cloud server, working with local data</translation> </message> <message> - <location filename="../core/git-access.c" line="623"/> + <location filename="../core/git-access.c" line="640"/> <source>Successful cloud connection, fetch remote</source> <translation>Successful cloud connection, fetch remote</translation> </message> <message> - <location filename="../core/git-access.c" line="642"/> + <location filename="../core/git-access.c" line="659"/> <source>Done syncing with cloud storage</source> <translation>Done syncing with cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="777"/> + <location filename="../core/git-access.c" line="794"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Error connecting to Subsurface cloud storage</translation> </message> <message> - <location filename="../core/git-access.c" line="780"/> + <location filename="../core/git-access.c" line="797"/> <source>git clone of %s failed (%s)</source> <translation>git clone of %s failed (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="806"/> + <location filename="../core/git-access.c" line="823"/> <source>Synchronising data file</source> <translation>Synchronising data file</translation> </message> <message> - <location filename="../core/import-divinglog.c" line="312"/> - <location filename="../core/libdivecomputer.c" line="236"/> - <location filename="../core/uemis-downloader.c" line="193"/> + <location filename="../core/import-divinglog.c" line="314"/> + <location filename="../core/libdivecomputer.c" line="244"/> + <location filename="../core/uemis-downloader.c" line="194"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="249"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>none</source> <translation>none</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="262"/> <source>workload</source> <translation>workload</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="267"/> <source>safety stop</source> <translation>safety stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="261"/> + <location filename="../core/libdivecomputer.c" line="269"/> <source>safety stop (voluntary)</source> <translation>safety stop (recommended)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="262"/> + <location filename="../core/libdivecomputer.c" line="270"/> <source>safety stop (mandatory)</source> <translation>safety stop (mandatory)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="271"/> <source>deepstop</source> <translation>deep stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="272"/> <source>ceiling (safety stop)</source> <translation>ceiling (safety stop)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="273"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="274"/> <source>divetime</source> <translation>divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="270"/> + <location filename="../core/libdivecomputer.c" line="278"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="279"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="272"/> + <location filename="../core/libdivecomputer.c" line="280"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="281"/> <source>tissue level warning</source> <translation>tissue level warning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="283"/> + <location filename="../core/libdivecomputer.c" line="291"/> <source>invalid event number</source> <translation>invalid event number</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="604"/> + <location filename="../core/libdivecomputer.c" line="612"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="622"/> + <location filename="../core/libdivecomputer.c" line="630"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="628"/> + <location filename="../core/libdivecomputer.c" line="636"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="646"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="657"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing temperature</source> <translation>Error parsing temperature</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="677"/> + <location filename="../core/libdivecomputer.c" line="685"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="689"/> + <location filename="../core/libdivecomputer.c" line="697"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="698"/> + <location filename="../core/libdivecomputer.c" line="706"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error obtaining dive mode</source> <translation>Error obtaining dive mode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="746"/> + <location filename="../core/libdivecomputer.c" line="754"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="772"/> + <location filename="../core/libdivecomputer.c" line="780"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="778"/> + <location filename="../core/libdivecomputer.c" line="786"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="799"/> + <location filename="../core/libdivecomputer.c" line="817"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="806"/> + <location filename="../core/libdivecomputer.c" line="824"/> <source>Already downloaded dive at %s</source> <translation>Already downloaded dive at %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="941"/> + <location filename="../core/libdivecomputer.c" line="1074"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="960"/> + <location filename="../core/libdivecomputer.c" line="1093"/> <source>model=%s firmware=%u serial=%u</source> <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1022"/> + <location filename="../core/libdivecomputer.c" line="1159"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1027"/> + <location filename="../core/libdivecomputer.c" line="1164"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1185"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1087"/> + <location filename="../core/libdivecomputer.c" line="1386"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1096"/> + <location filename="../core/libdivecomputer.c" line="1395"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1121"/> + <location filename="../core/libdivecomputer.c" line="1405"/> <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> @@ -9281,129 +9308,129 @@ In most cases, in order to debug this issue, a libdivecomputer logfile will be u You can create this logfile by selecting the corresponding checkbox in the download dialog.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1130"/> + <location filename="../core/libdivecomputer.c" line="1416"/> <source>No new dives downloaded from dive computer</source> <translation>No new dives downloaded from dive computer</translation> </message> <message> - <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1137"/> + <location filename="../core/load-git.c" line="169"/> + <location filename="../core/parse-xml.c" line="1159"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s </translation> </message> <message> - <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse.c" line="493"/> + <location filename="../core/load-git.c" line="197"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>additional name for site: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1726"/> + <location filename="../core/load-git.c" line="1672"/> <source>Load dives from local cache</source> <translation>Load dives from local cache</translation> </message> <message> - <location filename="../core/load-git.c" line="1730"/> + <location filename="../core/load-git.c" line="1676"/> <source>Successfully opened dive data</source> <translation>Successfully opened dive data</translation> </message> <message> - <location filename="../core/ostctools.c" line="124"/> - <location filename="../core/ostctools.c" line="155"/> + <location filename="../core/ostctools.c" line="125"/> + <location filename="../core/ostctools.c" line="156"/> <source>Unknown DC in dive %d</source> <translation>Unknown DC in dive %d</translation> </message> <message> - <location filename="../core/ostctools.c" line="167"/> + <location filename="../core/ostctools.c" line="168"/> <source>Error - %s - parsing dive %d</source> <translation>Error - %s - parsing dive %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="390"/> + <location filename="../core/parse-xml.c" line="392"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1602"/> + <location filename="../core/parse-xml.c" line="1624"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2035"/> + <location filename="../core/parse-xml.c" line="2057"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="111"/> + <location filename="../core/plannernotes.c" line="112"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="122"/> + <location filename="../core/plannernotes.c" line="106"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Decompression calculation aborted due to excessive time</translation> </message> <message> - <location filename="../core/plannernotes.c" line="124"/> - <location filename="../core/plannernotes.c" line="472"/> - <location filename="../core/plannernotes.c" line="478"/> - <location filename="../core/plannernotes.c" line="517"/> - <location filename="../core/plannernotes.c" line="548"/> + <location filename="../core/plannernotes.c" line="105"/> + <location filename="../core/plannernotes.c" line="453"/> + <location filename="../core/plannernotes.c" line="459"/> + <location filename="../core/plannernotes.c" line="498"/> + <location filename="../core/plannernotes.c" line="531"/> + <location filename="../core/plannernotes.c" line="565"/> <location filename="../core/plannernotes.c" line="576"/> - <location filename="../core/plannernotes.c" line="589"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="415"/> + <location filename="../core/plannernotes.c" line="398"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="320"/> - <location filename="../desktop-widgets/simplewidgets.cpp" line="211"/> + <location filename="../core/planner.c" line="327"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> <source>SP change</source> <translation>SP change</translation> </message> <message> - <location filename="../core/plannernotes.c" line="106"/> + <location filename="../core/plannernotes.c" line="95"/> <source>VPM-B</source> <translation>VPM-B</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="97"/> <source>BUHLMANN</source> <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="162"/> + <location filename="../core/plannernotes.c" line="149"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="167"/> + <location filename="../core/plannernotes.c" line="153"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="155"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../core/plannernotes.c" line="50"/> - <location filename="../core/plannernotes.c" line="173"/> + <location filename="../core/plannernotes.c" line="49"/> + <location filename="../core/plannernotes.c" line="157"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="176"/> + <location filename="../core/plannernotes.c" line="159"/> <source>gas</source> <translation>gas</translation> </message> @@ -9413,233 +9440,233 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Isobaric counterdiffusion information</translation> </message> <message> - <location filename="../core/plannernotes.c" line="54"/> + <location filename="../core/plannernotes.c" line="51"/> <source>&#916;He</source> <translation>&#916;He</translation> </message> <message> - <location filename="../core/plannernotes.c" line="56"/> + <location filename="../core/plannernotes.c" line="52"/> <source>&#916;N&#8322;</source> <translation>&#916;N&#8322;</translation> </message> <message> - <location filename="../core/plannernotes.c" line="58"/> + <location filename="../core/plannernotes.c" line="53"/> <source>max &#916;N&#8322;</source> <translation>max &#916;N&#8322;</translation> </message> <message> - <location filename="../core/plannernotes.c" line="246"/> + <location filename="../core/plannernotes.c" line="229"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="253"/> + <location filename="../core/plannernotes.c" line="236"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="299"/> + <location filename="../core/plannernotes.c" line="282"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="302"/> - <location filename="../core/plannernotes.c" line="306"/> + <location filename="../core/plannernotes.c" line="286"/> + <location filename="../core/plannernotes.c" line="291"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="315"/> - <location filename="../core/plannernotes.c" line="336"/> + <location filename="../core/plannernotes.c" line="301"/> + <location filename="../core/plannernotes.c" line="323"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="368"/> + <location filename="../core/plannernotes.c" line="354"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="370"/> + <location filename="../core/plannernotes.c" line="356"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="385"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="386"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="411"/> + <location filename="../core/plannernotes.c" line="394"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Deco model: VPM-B at nominal conservatism</translation> </message> <message> - <location filename="../core/plannernotes.c" line="504"/> + <location filename="../core/plannernotes.c" line="485"/> <source>Minimum gas</source> <translation>Minimum gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="505"/> + <location filename="../core/plannernotes.c" line="486"/> <source>based on</source> <translation>based on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="507"/> + <location filename="../core/plannernotes.c" line="488"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="526"/> + <location filename="../core/plannernotes.c" line="507"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="531"/> + <location filename="../core/plannernotes.c" line="512"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> <translation>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="534"/> + <location filename="../core/plannernotes.c" line="515"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s of <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="133"/> - <location filename="../core/plannernotes.c" line="141"/> - <location filename="../core/plannernotes.c" line="149"/> + <location filename="../core/plannernotes.c" line="121"/> + <location filename="../core/plannernotes.c" line="128"/> + <location filename="../core/plannernotes.c" line="136"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="151"/> + <location filename="../core/plannernotes.c" line="138"/> <source>dive plan</b> (surface interval </source> <translation>dive plan</b> (surface interval </translation> </message> <message> - <location filename="../core/plannernotes.c" line="153"/> + <location filename="../core/plannernotes.c" line="140"/> <source>created on</source> <translation>created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="143"/> + <location filename="../core/plannernotes.c" line="130"/> <source>dive plan</b> created on</source> <translation>dive plan</b> created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="135"/> + <location filename="../core/plannernotes.c" line="123"/> <source>dive plan</b> (overlapping dives detected)</source> <translation>dive plan</b> (overlapping dives detected)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="159"/> + <location filename="../core/plannernotes.c" line="146"/> <source>Runtime: %dmin%s</source> <translation>Runtime: %dmin%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="224"/> + <location filename="../core/plannernotes.c" line="206"/> <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="225"/> - <location filename="../core/plannernotes.c" line="233"/> + <location filename="../core/plannernotes.c" line="207"/> + <location filename="../core/plannernotes.c" line="215"/> <source>Ascend</source> <translation>Ascend</translation> </message> <message> - <location filename="../core/plannernotes.c" line="225"/> - <location filename="../core/plannernotes.c" line="233"/> + <location filename="../core/plannernotes.c" line="207"/> + <location filename="../core/plannernotes.c" line="215"/> <source>Descend</source> <translation>Descend</translation> </message> <message> - <location filename="../core/plannernotes.c" line="232"/> + <location filename="../core/plannernotes.c" line="214"/> <source>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>%s to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="406"/> + <location filename="../core/plannernotes.c" line="391"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="413"/> + <location filename="../core/plannernotes.c" line="396"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Deco model: VPM-B at +%d conservatism</translation> </message> <message> - <location filename="../core/plannernotes.c" line="419"/> + <location filename="../core/plannernotes.c" line="400"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="427"/> + <location filename="../core/plannernotes.c" line="408"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Atm. pressure: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="443"/> + <location filename="../core/plannernotes.c" line="423"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="445"/> + <location filename="../core/plannernotes.c" line="425"/> <source>Gas consumption (based on SAC</source> <translation>Gas consumption (based on SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="473"/> + <location filename="../core/plannernotes.c" line="454"/> <source>this is more gas than available in the specified cylinder!</source> <translation>this is more gas than available in the specified cylinder!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="460"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="518"/> + <location filename="../core/plannernotes.c" line="499"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>required minimum gas for ascent already exceeds start pressure of cylinder.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="523"/> + <location filename="../core/plannernotes.c" line="504"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="549"/> + <location filename="../core/plannernotes.c" line="532"/> <source>Isobaric counterdiffusion conditions exceeded</source> <translation>Isobaric counterdiffusion conditions exceeded</translation> </message> <message> - <location filename="../core/plannernotes.c" line="573"/> + <location filename="../core/plannernotes.c" line="563"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="586"/> + <location filename="../core/plannernotes.c" line="574"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="879"/> + <location filename="../core/planner.c" line="898"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1150"/> + <location filename="../core/planner.c" line="1170"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1377"/> + <location filename="../core/profile.c" line="1386"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9648,84 +9675,84 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1389"/> + <location filename="../core/profile.c" line="1398"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1404"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1407"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1400"/> + <location filename="../core/profile.c" line="1409"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1402"/> + <location filename="../core/profile.c" line="1411"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1413"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1415"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1418"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1449"/> + <location filename="../core/profile.c" line="1458"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1441"/> + <location filename="../core/profile.c" line="1450"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Safety stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1385"/> + <location filename="../core/profile.c" line="1394"/> <source>P: %d%s (%s) </source> <translation>P: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1418"/> + <location filename="../core/profile.c" line="1427"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9734,7 +9761,7 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1424"/> + <location filename="../core/profile.c" line="1433"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -9743,234 +9770,240 @@ EADD: %d%s / %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1438"/> <source>Density: %.1fg/ℓ </source> <translation>Density: %.1fg/ℓ </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1453"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Safety stop: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1452"/> + <location filename="../core/profile.c" line="1461"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1456"/> + <location filename="../core/profile.c" line="1465"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1458"/> + <location filename="../core/profile.c" line="1467"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1461"/> + <location filename="../core/profile.c" line="1470"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1464"/> + <location filename="../core/profile.c" line="1473"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1472"/> + <location filename="../core/profile.c" line="1481"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1475"/> + <location filename="../core/profile.c" line="1484"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1477"/> + <location filename="../core/profile.c" line="1486"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1490"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1483"/> + <location filename="../core/profile.c" line="1492"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1495"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1489"/> + <location filename="../core/profile.c" line="1498"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1495"/> + <location filename="../core/profile.c" line="1504"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tissue %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1501"/> + <location filename="../core/profile.c" line="1510"/> + <source>ICD in leading tissue +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1512"/> <source>heart rate: %d </source> <translation>heart rate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1503"/> + <location filename="../core/profile.c" line="1514"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1506"/> + <location filename="../core/profile.c" line="1517"/> <source>mean depth to here %.1f%s </source> <translation>mean depth to here %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1603"/> + <location filename="../core/profile.c" line="1614"/> <source>%sT:%d:%02dmin</source> <translation>%sT:%d:%02dmin</translation> </message> <message> - <location filename="../core/profile.c" line="1638"/> + <location filename="../core/profile.c" line="1649"/> <source>%s %sP:%d%s</source> <translation>%s %sP:%d%s</translation> </message> <message> - <location filename="../core/profile.c" line="1663"/> + <location filename="../core/profile.c" line="1674"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/min</translation> </message> <message> - <location filename="../core/profile.c" line="1607"/> - <location filename="../core/profile.c" line="1611"/> - <location filename="../core/profile.c" line="1615"/> + <location filename="../core/profile.c" line="1618"/> + <location filename="../core/profile.c" line="1622"/> + <location filename="../core/profile.c" line="1626"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1619"/> + <location filename="../core/profile.c" line="1630"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1623"/> + <location filename="../core/profile.c" line="1634"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1627"/> - <location filename="../core/profile.c" line="1631"/> + <location filename="../core/profile.c" line="1638"/> + <location filename="../core/profile.c" line="1642"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="60"/> + <location filename="../core/qthelper.cpp" line="66"/> <source>%1km</source> <translation>%1km</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="62"/> + <location filename="../core/qthelper.cpp" line="68"/> <source>%1m</source> <translation>%1m</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="66"/> + <location filename="../core/qthelper.cpp" line="72"/> <source>%1mi</source> <translation>%1mi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="68"/> + <location filename="../core/qthelper.cpp" line="74"/> <source>%1yd</source> <translation>%1yd</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="84"/> - <location filename="../core/qthelper.cpp" line="219"/> + <location filename="../core/qthelper.cpp" line="90"/> + <location filename="../core/qthelper.cpp" line="225"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="84"/> - <location filename="../core/qthelper.cpp" line="220"/> + <location filename="../core/qthelper.cpp" line="90"/> + <location filename="../core/qthelper.cpp" line="226"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="85"/> - <location filename="../core/qthelper.cpp" line="221"/> + <location filename="../core/qthelper.cpp" line="91"/> + <location filename="../core/qthelper.cpp" line="227"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="85"/> - <location filename="../core/qthelper.cpp" line="222"/> + <location filename="../core/qthelper.cpp" line="91"/> + <location filename="../core/qthelper.cpp" line="228"/> <source>W</source> <translation>W</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="611"/> + <location filename="../core/qthelper.cpp" line="617"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="614"/> + <location filename="../core/qthelper.cpp" line="620"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="956"/> + <location filename="../core/qthelper.cpp" line="948"/> <source>more than %1 days</source> <translation>more than %1 days</translation> </message> <message> <location filename="../core/save-html.c" line="472"/> <location filename="../core/save-html.c" line="556"/> - <location filename="../core/worldmap-save.c" line="114"/> + <location filename="../core/worldmap-save.c" line="113"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> </message> @@ -10071,8 +10104,8 @@ EADD: %d%s / %.1fg/ℓ </message> <message> <location filename="../core/save-html.c" line="512"/> - <location filename="../smtk-import/smartrak.c" line="295"/> - <location filename="../smtk-import/smartrak.c" line="368"/> + <location filename="../smtk-import/smartrak.c" line="296"/> + <location filename="../smtk-import/smartrak.c" line="369"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -10243,127 +10276,92 @@ EADD: %d%s / %.1fg/ℓ <translation>Dive status</translation> </message> <message> - <location filename="../core/statistics.c" line="142"/> + <location filename="../core/statistics.c" line="141"/> <source>All (by type stats)</source> <translation>All (by type stats)</translation> </message> <message> - <location filename="../core/statistics.c" line="144"/> - <source>OC</source> - <translation>OC</translation> - </message> - <message> - <location filename="../core/statistics.c" line="146"/> + <location filename="../core/dive.c" line="42"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../core/statistics.c" line="148"/> + <location filename="../core/dive.c" line="43"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../core/statistics.c" line="150"/> + <location filename="../core/dive.c" line="44"/> <source>Freedive</source> <translation>Freedive</translation> </message> <message> - <location filename="../core/statistics.c" line="195"/> + <location filename="../core/statistics.c" line="194"/> <source>All (by trip stats)</source> <translation>All (by trip stats)</translation> </message> <message> - <location filename="../core/statistics.c" line="245"/> - <source>for dives #</source> - <translation>for dive No.s</translation> - </message> - <message> - <location filename="../core/statistics.c" line="251"/> - <source>for selected dives</source> - <translation>for selected dives</translation> - </message> - <message> - <location filename="../core/statistics.c" line="286"/> - <source>for dive #%d</source> - <translation>for dive No. %d</translation> - </message> - <message> - <location filename="../core/statistics.c" line="288"/> - <source>for selected dive</source> - <translation>for selected dive</translation> - </message> - <message> - <location filename="../core/statistics.c" line="290"/> - <source>for all dives</source> - <translation>for all dives</translation> - </message> - <message> - <location filename="../core/statistics.c" line="292"/> - <source>(no dives)</source> - <translation>(no dives)</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="132"/> + <location filename="../core/subsurfacestartup.c" line="135"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="132"/> + <location filename="../core/subsurfacestartup.c" line="135"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="132"/> + <location filename="../core/subsurfacestartup.c" line="135"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="132"/> + <location filename="../core/subsurfacestartup.c" line="135"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="132"/> + <location filename="../core/subsurfacestartup.c" line="135"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="132"/> + <location filename="../core/subsurfacestartup.c" line="135"/> <source>Dec</source> <translation>Dec</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="28"/> + <location filename="../core/uemis-downloader.c" line="29"/> <source>Uemis Zurich: the file system is almost full. Disconnect/reconnect the dive computer and click 'Retry'</source> @@ -10372,7 +10370,7 @@ Disconnect/reconnect the dive computer and click 'Retry'</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="29"/> + <location filename="../core/uemis-downloader.c" line="30"/> <source>Uemis Zurich: the file system is full. Disconnect/reconnect the dive computer and click Retry</source> @@ -10381,321 +10379,321 @@ Disconnect/reconnect the dive computer and click Retry</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="30"/> + <location filename="../core/uemis-downloader.c" line="31"/> <source>Short write to req.txt file. Is the Uemis Zurich plugged in correctly?</source> <translation>Short write to req.txt file. Is the Uemis Zurich plugged in correctly?</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="31"/> + <location filename="../core/uemis-downloader.c" line="32"/> <source>No dives to download.</source> <translation>No dives to download.</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="507"/> + <location filename="../core/uemis-downloader.c" line="508"/> <source>%s %s</source> <translation>%s %s</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="527"/> + <location filename="../core/uemis-downloader.c" line="528"/> <source>data</source> <translation>data</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="555"/> + <location filename="../core/uemis-downloader.c" line="556"/> <source>dive log #</source> <translation>dive log No.</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="557"/> + <location filename="../core/uemis-downloader.c" line="558"/> <source>dive spot #</source> <translation>dive spot No.</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="559"/> + <location filename="../core/uemis-downloader.c" line="560"/> <source>details for #</source> <translation>details for #</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="789"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>wetsuit</source> <translation>wetsuit</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="789"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>semidry</source> <translation>semidry</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="789"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>drysuit</source> <translation>drysuit</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>shorty</source> <translation>shorty</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>vest</source> <translation>vest</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>long john</source> <translation>long john</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>jacket</source> <translation>jacket</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>full suit</source> <translation>full suit</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="790"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>2 pcs full suit</source> <translation>2 pcs full suit</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="791"/> + <location filename="../core/uemis-downloader.c" line="792"/> <source>membrane</source> <translation>membrane</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1328"/> + <location filename="../core/uemis-downloader.c" line="1329"/> <source>Initialise communication</source> <translation>Initialise communication</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1331"/> + <location filename="../core/uemis-downloader.c" line="1332"/> <source>Uemis init failed</source> <translation>Uemis init failed</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1343"/> + <location filename="../core/uemis-downloader.c" line="1344"/> <source>Start download</source> <translation>Start download</translation> </message> <message> - <location filename="../core/uemis.c" line="202"/> + <location filename="../core/uemis.c" line="201"/> <source>Safety stop violation</source> <translation>Safety stop violation</translation> </message> <message> - <location filename="../core/uemis.c" line="204"/> + <location filename="../core/uemis.c" line="203"/> <source>Speed alarm</source> <translation>Speed alarm</translation> </message> <message> - <location filename="../core/uemis.c" line="207"/> + <location filename="../core/uemis.c" line="206"/> <source>Speed warning</source> <translation>Speed warning</translation> </message> <message> - <location filename="../core/uemis.c" line="209"/> + <location filename="../core/uemis.c" line="208"/> <source>pO₂ green warning</source> <translation>pO₂ green warning</translation> </message> <message> - <location filename="../core/uemis.c" line="212"/> + <location filename="../core/uemis.c" line="211"/> <source>pO₂ ascend warning</source> <translation>pO₂ ascend warning</translation> </message> <message> - <location filename="../core/uemis.c" line="214"/> + <location filename="../core/uemis.c" line="213"/> <source>pO₂ ascend alarm</source> <translation>pO₂ ascend alarm</translation> </message> <message> - <location filename="../core/uemis.c" line="218"/> + <location filename="../core/uemis.c" line="217"/> <source>Tank pressure info</source> <translation>Tank pressure info</translation> </message> <message> - <location filename="../core/uemis.c" line="220"/> + <location filename="../core/uemis.c" line="219"/> <source>RGT warning</source> <translation>RGT warning</translation> </message> <message> - <location filename="../core/uemis.c" line="222"/> + <location filename="../core/uemis.c" line="221"/> <source>RGT alert</source> <translation>RGT alert</translation> </message> <message> - <location filename="../core/uemis.c" line="224"/> + <location filename="../core/uemis.c" line="223"/> <source>Tank change suggested</source> <translation>Tank change suggested</translation> </message> <message> - <location filename="../core/uemis.c" line="226"/> + <location filename="../core/uemis.c" line="225"/> <source>Depth limit exceeded</source> <translation>Depth limit exceeded</translation> </message> <message> - <location filename="../core/uemis.c" line="228"/> + <location filename="../core/uemis.c" line="227"/> <source>Max deco time warning</source> <translation>Max deco time warning</translation> </message> <message> - <location filename="../core/uemis.c" line="230"/> + <location filename="../core/uemis.c" line="229"/> <source>Dive time info</source> <translation>Dive time info</translation> </message> <message> - <location filename="../core/uemis.c" line="232"/> + <location filename="../core/uemis.c" line="231"/> <source>Dive time alert</source> <translation>Dive time alert</translation> </message> <message> - <location filename="../core/uemis.c" line="234"/> + <location filename="../core/uemis.c" line="233"/> <source>Marker</source> <translation>Marker</translation> </message> <message> - <location filename="../core/uemis.c" line="236"/> + <location filename="../core/uemis.c" line="235"/> <source>No tank data</source> <translation>No tank data</translation> </message> <message> - <location filename="../core/uemis.c" line="238"/> + <location filename="../core/uemis.c" line="237"/> <source>Low battery warning</source> <translation>Low battery warning</translation> </message> <message> - <location filename="../core/uemis.c" line="240"/> + <location filename="../core/uemis.c" line="239"/> <source>Low battery alert</source> <translation>Low battery alert</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="42"/> + <location filename="../core/worldmap-save.c" line="41"/> <source>Date:</source> <translation>Date:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="44"/> + <location filename="../core/worldmap-save.c" line="43"/> <source>Time:</source> <translation>Time:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="46"/> + <location filename="../core/worldmap-save.c" line="45"/> <source>Duration:</source> <translation>Duration:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="63"/> - <location filename="../core/plannernotes.c" line="509"/> - <location filename="../core/worldmap-save.c" line="47"/> + <location filename="../core/plannernotes.c" line="58"/> + <location filename="../core/plannernotes.c" line="490"/> + <location filename="../core/worldmap-save.c" line="46"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="50"/> + <location filename="../core/worldmap-save.c" line="49"/> <source>Max. depth:</source> <translation>Max. depth:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="53"/> + <location filename="../core/worldmap-save.c" line="52"/> <source>Air temp.:</source> <translation>Air temp.:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="56"/> + <location filename="../core/worldmap-save.c" line="55"/> <source>Water temp.:</source> <translation>Water temp.:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="58"/> + <location filename="../core/worldmap-save.c" line="57"/> <source>Location:</source> <translation>Location:</translation> </message> <message> - <location filename="../core/worldmap-save.c" line="62"/> + <location filename="../core/worldmap-save.c" line="61"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="291"/> + <location filename="../smtk-import/smartrak.c" line="292"/> <source>Built</source> <translation>Built</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="291"/> + <location filename="../smtk-import/smartrak.c" line="292"/> <source>Sank</source> <translation>Sank</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="291"/> + <location filename="../smtk-import/smartrak.c" line="292"/> <source>Sank Time</source> <translation>Submerge time</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="293"/> <source>Reason</source> <translation>Reason</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="293"/> <source>Nationality</source> <translation>Nationality</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="292"/> + <location filename="../smtk-import/smartrak.c" line="293"/> <source>Shipyard</source> <translation>Shipyard</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="294"/> <source>ShipType</source> <translation>ShipType</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="294"/> <source>Length</source> <translation>Length</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="293"/> + <location filename="../smtk-import/smartrak.c" line="294"/> <source>Beam</source> <translation>Beam</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="295"/> <source>Draught</source> <translation>Draught</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="295"/> <source>Displacement</source> <translation>Displacement</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="294"/> + <location filename="../smtk-import/smartrak.c" line="295"/> <source>Cargo</source> <translation>Cargo</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="306"/> + <location filename="../smtk-import/smartrak.c" line="307"/> <source>Wreck Data</source> <translation>Wreck Data</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="367"/> + <location filename="../smtk-import/smartrak.c" line="368"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="367"/> + <location filename="../smtk-import/smartrak.c" line="368"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="190"/> <source>planned waypoint above ceiling</source> <translation>planned waypoint above ceiling</translation> </message> @@ -10735,25 +10733,30 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>City</translation> </message> <message> - <location filename="../core/save-git.c" line="963"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Start saving data</translation> </message> <message> - <location filename="../core/save-git.c" line="972"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Start saving dives</translation> </message> <message> - <location filename="../core/save-git.c" line="1005"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Done creating local cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1253"/> + <location filename="../core/save-git.c" line="1245"/> <source>Preparing to save data</source> <translation>Preparing to save data</translation> </message> + <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1627"/> + <source>modechange</source> + <translation type="unfinished"/> + </message> </context> <context> <name>main</name> @@ -10778,12 +10781,22 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Dive management</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> + <source>Disable auto cloud sync</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> + <source>Enable auto cloud sync</source> + <translation>Enable auto cloud sync</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="278"/> <source>Disable location service</source> <translation>Disable location service</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="298"/> + <location filename="../mobile-widgets/qml/main.qml" line="300"/> <source>Settings</source> <translation>Settings</translation> </message> @@ -10793,92 +10806,84 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Add dive manually</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="165"/> + <location filename="../mobile-widgets/qml/main.qml" line="166"/> <source>Download from DC</source> <translation>Download from DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Manual sync with cloud</source> <translation>Manual sync with cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="207"/> - <source>Offline mode</source> - <translation>Offline mode</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="212"/> + <location filename="../mobile-widgets/qml/main.qml" line="214"/> <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>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.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="223"/> + <location filename="../mobile-widgets/qml/main.qml" line="225"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="331"/> + <location filename="../mobile-widgets/qml/main.qml" line="333"/> <source>Help</source> <translation>Help</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="230"/> + <location filename="../mobile-widgets/qml/main.qml" line="232"/> <source>Upload GPS data</source> <translation>Upload GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="177"/> + <location filename="../mobile-widgets/qml/main.qml" line="178"/> <source>Apply GPS fixes</source> <translation>Apply GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="207"/> - <source>Auto cloud sync enabled</source> - <translation>Auto cloud sync enabled</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="241"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>Download GPS data</source> <translation>Download GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="252"/> + <location filename="../mobile-widgets/qml/main.qml" line="254"/> <source>Show GPS fixes</source> <translation>Show GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="265"/> + <location filename="../mobile-widgets/qml/main.qml" line="267"/> <source>Clear GPS cache</source> <translation>Clear GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="309"/> + <location filename="../mobile-widgets/qml/main.qml" line="311"/> <source>Developer</source> <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="312"/> + <location filename="../mobile-widgets/qml/main.qml" line="314"/> <source>App log</source> <translation>App log</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="320"/> + <location filename="../mobile-widgets/qml/main.qml" line="322"/> <source>Theme information</source> <translation>Theme information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="287"/> + <location filename="../mobile-widgets/qml/main.qml" line="289"/> <source>About</source> <translation>About</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="278"/> <source>Run location service</source> <translation>Run location service</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/> + <location filename="../mobile-widgets/qml/kirigami/examples/qmakewithstaticplugin/src/main.qml" line="28"/> + <location filename="../mobile-widgets/qml/kirigami/examples/staticcmake/src/main.qml" line="28"/> <source>Hello World</source> <translation>Hello World</translation> </message> |