diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-10-29 20:14:15 +0100 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-10-29 20:14:15 +0100 |
| commit | c88b59392bbf030b900fc40f7f1419c13a815c9d (patch) | |
| tree | 9f01fece9578b7f867ae06ebb417e611c27b722d /translations/subsurface_en_GB.ts | |
| parent | 090e86e34d1aad8dc4b907ccd3e461bc6de73fc8 (diff) | |
| download | subsurface-c88b59392bbf030b900fc40f7f1419c13a815c9d.tar.gz | |
Latest translations
This includes several fixed translations where arguments didn't
match the source strings, several of which could likely have
resulted in crashes.
Credit goes to Robert's update to checktranslation.pl.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 768 |
1 files changed, 412 insertions, 356 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index d1f4ebb41..d5d458408 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <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="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <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="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <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="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <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="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <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> @@ -2052,67 +2060,67 @@ GPS location:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>No profile to show</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Map it</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Visibility:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -2120,23 +2128,23 @@ GPS location:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manual switch to OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -2174,23 +2182,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="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <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="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>No dives in dive list</translation> </message> @@ -2198,102 +2206,102 @@ GPS location:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <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="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <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="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Shift dive times</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Split selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <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="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Load image from web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Image files (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <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="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Open image files</translation> </message> @@ -2301,12 +2309,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <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="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -2966,27 +2974,33 @@ GPS location:</translation> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>cyl.</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3022,112 +3036,107 @@ GPS location:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Colour</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>User entered</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Cylinder index</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Pressure S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Pressure I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Ambient pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Heart rate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Mean depth @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>error writing zip file: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem with download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>The archive could not be opened: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Choose Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Connecting to dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Cancel download</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Download</translation> </message> @@ -3606,7 +3615,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="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth is not enabled</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation> Vendor name: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation> Dive Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation> Connection:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation> Downloaded dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Connect to Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Facebook logged in successfully</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, unknown user id, cannot login.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Dive uploaded successfully to Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Dive upload failed. Please see debug output and send to Subsurface mailing list</translation> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Dive site management</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to continue?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>You are editing a dive site</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Open</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Redo</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Take cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <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="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <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="642"/> <source>Traverse image directories</source> <translation>Traverse image directories</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <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="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation>Trying to merge dives with %1min interval between them</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <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="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <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="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <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="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <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="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <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="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <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="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <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="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <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="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <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="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Drag the selected dive location</translation> </message> @@ -5117,32 +5131,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Dive site geo lookup</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Enable geocoding for dive site management</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Parse site without GPS data</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Same format for existing dives</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation>Dive site layout</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5446,7 +5440,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="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface cloud storage</translation> </message> @@ -5527,6 +5521,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <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="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5797,28 +5801,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Import template file</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML files (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Export template files as</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>This action cannot be undone!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Delete template: %1?</translation> </message> @@ -5826,12 +5830,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> @@ -5841,108 +5845,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Make default dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Planned dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Manually added dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Add setpoint change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -5950,147 +5954,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <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="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <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="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <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="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <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="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <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="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <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="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <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="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <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="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <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="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <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="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6248,6 +6252,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>No dive site layout categories set in preferences.</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tags</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6663,64 +6677,64 @@ Files with inappropriate date/time</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Small</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dive date: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duration: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dive location: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6813,12 +6827,12 @@ Files with inappropriate date/time</translation> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <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> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7443,7 +7457,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1click to visit %2</translation> </message> @@ -8399,8 +8413,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8485,15 +8499,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>air</translation> </message> @@ -8722,7 +8736,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unknown</translation> @@ -8982,7 +8996,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -8998,21 +9012,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP change</translation> @@ -9028,195 +9042,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>dive plan</b> (Overlapping dives detected)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <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="198"/> + <location filename="../core/plannernotes.c" line="207"/> <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="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <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="433"/> + <source>Minimum gas</source> + <translation>Minimum gas</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>based on</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>dive plan</b> (surface interval </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>dive plan</b> created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIATIONS<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <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="331"/> + <location filename="../core/plannernotes.c" line="340"/> <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="337"/> + <location filename="../core/plannernotes.c" line="346"/> <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="345"/> + <location filename="../core/plannernotes.c" line="354"/> <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="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gas consumption (based on SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <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="399"/> + <location filename="../core/plannernotes.c" line="408"/> <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="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <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="435"/> + <location filename="../core/plannernotes.c" line="451"/> <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="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <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="475"/> + <location filename="../core/plannernotes.c" line="491"/> <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="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9818,6 +9848,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Dive status</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Freedive</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>All (by trip stats)</translation> @@ -9853,97 +9908,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(no dives)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10173,6 +10228,7 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Duration:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10278,7 +10334,7 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Depth</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>planned waypoint above ceiling</translation> </message> @@ -10318,22 +10374,22 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>City</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <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="994"/> + <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="1027"/> + <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="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Preparing to save data</translation> </message> |