diff options
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 1588 |
1 files changed, 875 insertions, 713 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 0d27f63c0..e47c8499b 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -32,6 +32,14 @@ </message> </context> <context> + <name>BackButton</name> + <message> + <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> + <source>Navigate Back</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>BtDeviceSelectionDialog</name> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="14"/> @@ -40,37 +48,37 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Discovered devices</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Save</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> <source>Quit</source> <translation>Quit</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Scan</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Clear</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="30"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Local Bluetooth device details</translation> </message> @@ -81,213 +89,213 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Address:</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth powered on</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Turn on/off</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="31"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Select device:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="36"/> <source>Name:</source> <translation>Name:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="57"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> <source>Could not initialize Winsock version 2.2</source> <translation>Could not initialize Winsock version 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="135"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Trying to turn on the local Bluetooth device...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Trying to turn off the local Bluetooth device...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="168"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> <source>Remote devices list was cleared.</source> <translation>Remote devices list was cleared.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="184"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="189"/> <source>Scanning for remote devices...</source> <translation>Scanning for remote devices...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="198"/> <source>Scanning finished successfully.</source> <translation>Scanning finished successfully.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="214"/> <source>The local Bluetooth device was %1.</source> <extracomment>%1 will be replaced with "turned on" or "turned off"</extracomment> <translation>The local Bluetooth device was %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="210"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>turned on</source> <translation>turned on</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="210"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="215"/> <source>turned off</source> <translation>turned off</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="226"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="347"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="367"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> <source>UNPAIRED</source> <translation>UNPAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="230"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> <source>PAIRED</source> <translation>PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="233"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="357"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>AUTHORIZED_PAIRED</source> <translation>AUTHORISED_PAIRED</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="240"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="253"/> <source>%1 (%2) [State: %3]</source> <translation>%1 (%2) [State: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="257"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>The device %1 can be used for connection. You can press the Save button.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="266"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="271"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> <source>A device needs a non-zero address for a connection.</source> - <translation type="unfinished"/> + <translation>A device needs a non-zero address for a connection.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="294"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> <source>The local device was changed.</source> <translation>The local device was changed.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="314"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> <source>Pair</source> <translation>Pair</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="315"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> <source>Remove pairing</source> <translation>Remove pairing</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="331"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> <source>Trying to pair device %1</source> <translation>Trying to pair device %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="335"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> <source>Trying to unpair device %1</source> <translation>Trying to unpair device %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="348"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> <source>Device %1 was unpaired.</source> <translation>Device %1 was unpaired.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> <source>Device %1 was paired.</source> <translation>Device %1 was paired.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="360"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> <source>Device %1 was paired and is authorized.</source> <translation>Device %1 was paired and is authorised.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="386"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>The device %1 can now be used for connection. You can press the Save button.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="398"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> <source>Local device error: %1.</source> <translation>Local device error: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="399"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> <source>Unknown error</source> <translation>Unknown error</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>The Bluetooth adaptor is powered off, power it on before doing discovery.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="413"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Writing to or reading from the device resulted in an error.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>An unknown error has occurred.</source> <translation>An unknown error has occurred.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="424"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> <source>Device discovery error: %1.</source> <translation>Device discovery error: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="453"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> <source>Not available</source> <translation>Not available</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="460"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>The local Bluetooth adapter cannot be accessed.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="510"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</translation> </message> @@ -318,12 +326,12 @@ <message numerus="yes"> <location filename="../core/checkcloudconnection.cpp" line="58"/> <source>Waiting for cloud connection (%n second(s) passed)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>Waiting for cloud connection (%n second(s) passed)</numerusform><numerusform>Waiting for cloud connection (%n second(s) passed)</numerusform></translation> </message> <message> <location filename="../core/checkcloudconnection.cpp" line="65"/> <source>Cloud connection failed</source> - <translation type="unfinished"/> + <translation>Cloud connection failed</translation> </message> </context> <context> @@ -339,15 +347,35 @@ <translation>Email</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="72"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="71"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="91"/> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="89"/> <source>PIN</source> <translation>PIN</translation> </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> + <source>Register</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> + <source>Cancel</source> + <translation>Cancel</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> + <source>Sign-in or Register</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> + <source>No cloud mode</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ColumnNameProvider</name> @@ -525,42 +553,42 @@ <context> <name>ConfigureDiveComputer</name> <message> - <location filename="../core/configuredivecomputer.cpp" line="220"/> + <location filename="../core/configuredivecomputer.cpp" line="221"/> <source>Could not save the backup file %1. Error Message: %2</source> <translation>Could not save the backup file %1. Error Message: %2</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="236"/> + <location filename="../core/configuredivecomputer.cpp" line="237"/> <source>Could not open backup file: %1</source> <translation>Could not open backup file: %1</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="584"/> + <location filename="../core/configuredivecomputer.cpp" line="585"/> <source>Dive computer details read successfully</source> <translation>Dive computer details read successfully</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="593"/> + <location filename="../core/configuredivecomputer.cpp" line="594"/> <source>Setting successfully written to device</source> <translation>Setting successfully written to device</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="602"/> + <location filename="../core/configuredivecomputer.cpp" line="603"/> <source>Device firmware successfully updated</source> <translation>Device firmware successfully updated</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="611"/> + <location filename="../core/configuredivecomputer.cpp" line="612"/> <source>Device settings successfully reset</source> <translation>Device settings successfully reset</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="627"/> + <location filename="../core/configuredivecomputer.cpp" line="628"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/configuredivecomputer.cpp" line="656"/> + <location filename="../core/configuredivecomputer.cpp" line="659"/> <source>Could not a establish connection to the dive computer.</source> <translation>Could not a establish connection to the dive computer.</translation> </message> @@ -660,7 +688,7 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="241"/> <source>OSTC 4</source> - <translation type="unfinished"/> + <translation>OSTC 4</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="262"/> @@ -1577,22 +1605,22 @@ <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3267"/> <source>Travel gas consumption</source> - <translation type="unfinished"/> + <translation>Travel gas consumption</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3290"/> <source>Button sensitivity</source> - <translation type="unfinished"/> + <translation>Button sensitivity</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3420"/> <source>VPM</source> - <translation type="unfinished"/> + <translation>VPM</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3560"/> <source>VPM conservatism</source> - <translation type="unfinished"/> + <translation>VPM conservatism</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="3567"/> @@ -1896,17 +1924,22 @@ <translation>Dive details</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="78"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> <source>Delete dive</source> <translation>Delete dive</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <source>Cancel edit</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> <source>Show on map</source> <translation>Show on map</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> <source>Multiple Buddies</source> <translation>Multiple buddies</translation> </message> @@ -2003,12 +2036,12 @@ GPS location:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> <source>Rating:</source> - <translation type="unfinished"/> + <translation>Rating:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Visibility:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> @@ -2046,17 +2079,17 @@ GPS location:</translation> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> <source>Map it</source> - <translation type="unfinished"/> + <translation>Map it</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> <source>Rating:</source> - <translation type="unfinished"/> + <translation>Rating:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> <source>Visibility:</source> - <translation type="unfinished"/> + <translation>Visibility:</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> @@ -2154,10 +2187,10 @@ GPS location:</translation> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> - <translation type="unfinished"/> + <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="306"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> <source>No dives in dive list</source> <translation>No dives in dive list</translation> </message> @@ -2165,102 +2198,102 @@ GPS location:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="850"/> + <location filename="../desktop-widgets/divelistview.cpp" line="847"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="852"/> + <location filename="../desktop-widgets/divelistview.cpp" line="849"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="856"/> + <location filename="../desktop-widgets/divelistview.cpp" line="853"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="860"/> + <location filename="../desktop-widgets/divelistview.cpp" line="857"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="861"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="875"/> + <location filename="../desktop-widgets/divelistview.cpp" line="872"/> <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="877"/> + <location filename="../desktop-widgets/divelistview.cpp" line="874"/> <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="881"/> + <location filename="../desktop-widgets/divelistview.cpp" line="878"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="882"/> + <location filename="../desktop-widgets/divelistview.cpp" line="879"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="886"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="888"/> + <location filename="../desktop-widgets/divelistview.cpp" line="885"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="889"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="891"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Shift dive times</source> <translation>Shift dive times</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="896"/> + <location filename="../desktop-widgets/divelistview.cpp" line="893"/> <source>Split selected dives</source> <translation>Split selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="897"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <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="898"/> + <location filename="../desktop-widgets/divelistview.cpp" line="895"/> <source>Load image from web</source> <translation>Load image from web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="924"/> + <location filename="../desktop-widgets/divelistview.cpp" line="921"/> <source>Image files (%1)</source> - <translation type="unfinished"/> + <translation>Image files (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="980"/> + <location filename="../desktop-widgets/divelistview.cpp" line="977"/> <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="922"/> + <location filename="../desktop-widgets/divelistview.cpp" line="919"/> <source>Open image files</source> <translation>Open image files</translation> </message> @@ -2268,12 +2301,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="329"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> <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="330"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="362"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -2928,32 +2961,32 @@ GPS location:</translation> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="153"/> + <location filename="../qt-models/diveplannermodel.cpp" line="155"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="344"/> + <location filename="../qt-models/diveplannermodel.cpp" line="346"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="348"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="350"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="352"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="354"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3158,137 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="422"/> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> + <location filename="../qt-models/divetripmodel.cpp" line="450"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="425"/> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> + <location filename="../qt-models/divetripmodel.cpp" line="453"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="428"/> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="456"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="431"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="434"/> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> + <location filename="../qt-models/divetripmodel.cpp" line="462"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="440"/> + <location filename="../qt-models/divetripmodel.cpp" line="468"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="443"/> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="471"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="437"/> + <location filename="../qt-models/divetripmodel.cpp" line="465"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="446"/> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> + <location filename="../qt-models/divetripmodel.cpp" line="474"/> + <location filename="../qt-models/divetripmodel.cpp" line="526"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="449"/> - <location filename="../qt-models/divetripmodel.cpp" line="498"/> + <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="529"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="452"/> + <location filename="../qt-models/divetripmodel.cpp" line="480"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="455"/> - <location filename="../qt-models/divetripmodel.cpp" line="506"/> + <location filename="../qt-models/divetripmodel.cpp" line="483"/> + <location filename="../qt-models/divetripmodel.cpp" line="537"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="458"/> - <location filename="../qt-models/divetripmodel.cpp" line="509"/> + <location filename="../qt-models/divetripmodel.cpp" line="486"/> + <location filename="../qt-models/divetripmodel.cpp" line="540"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="461"/> + <location filename="../qt-models/divetripmodel.cpp" line="489"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="464"/> - <location filename="../qt-models/divetripmodel.cpp" line="515"/> + <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <source>Country</source> + <translation>Country</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="495"/> + <location filename="../qt-models/divetripmodel.cpp" line="546"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <location filename="../qt-models/divetripmodel.cpp" line="534"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="503"/> + <location filename="../qt-models/divetripmodel.cpp" line="534"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="512"/> + <location filename="../qt-models/divetripmodel.cpp" line="543"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> @@ -3296,112 +3334,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="166"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> <source>no dives were selected</source> <translation>no dives were selected</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="176"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>stylesheet to export to divelogs.de is not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="186"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="187"/> <source>failed to create zip file for upload: %s</source> <translation>failed to create zip file for upload: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="250"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/> <source>internal error</source> <translation>internal error</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="258"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="259"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Conversion of dive %1 to divelogs.de format failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="286"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="287"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>error writing zip file: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>Problem with download</source> <translation>Problem with download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> <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="922"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> <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="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3419,52 +3457,58 @@ p, li { white-space: pre-wrap; } <translation>Choose Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="187"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <source>Connecting to dive computer</source> + <translation>Connecting to dive computer</translation> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="235"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="260"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> <source>Cancel download</source> <translation>Cancel download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="343"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> <source>Choose file for dive computer download logfile</source> <translation>Choose logfile for dive computer download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> <source>Choose file for dive computer binary dump file</source> <translation>Choose file for dive computer binary dump</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> <source>Retry download</source> <translation>Retry download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="344"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> <source>Log files (*.log)</source> <translation>Log files (*.log)</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="357"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="358"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Saving the libdivecomputer dump will NOT download dives to the dive list.</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="370"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="403"/> <source>Dump files (*.bin)</source> <translation>Dump files (*.bin)</translation> </message> @@ -3541,27 +3585,27 @@ p, li { white-space: pre-wrap; } <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="233"/> <source>Downloaded dives</source> <translation>Downloaded dives</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="236"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/> <source>Select all</source> <translation>Select all</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="243"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="250"/> <source>Unselect all</source> <translation>Deselect all</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Cancel</source> <translation>Cancel</translation> @@ -3574,7 +3618,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="21"/> <source>Bluetooth is not enabled</source> - <translation type="unfinished"/> + <translation>Bluetooth is not enabled</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> @@ -3589,7 +3633,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> <source> Connection:</source> - <translation type="unfinished"/> + <translation> Connection:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> @@ -3609,7 +3653,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> <source>Info:</source> - <translation type="unfinished"/> + <translation>Info:</translation> </message> <message> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> @@ -3653,12 +3697,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="257"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> <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="266"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> <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> @@ -3666,28 +3710,24 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/> - <source>Photo upload sucessfull</source> - <translation>Photo upload sucessfull</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <source>Facebook logged in successfully</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="218"/> - <source>Your dive profile was updated to Facebook.</source> - <translation>Your dive profile was updated to Facebook.</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <source>Error, unknown user id, cannot login.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="222"/> - <source>Photo upload failed</source> - <translation>Photo upload failed</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <source>Dive uploaded successfully to Facebook</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="223"/> - <source>Your dive profile was not updated to Facebook, - please send the following to the developer. -</source> - <translation>Your dive profile was not updated to Facebook, - please send the following to the developer. -</translation> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3748,9 +3788,17 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ForwardButton</name> + <message> + <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> + <source>Navigate Forward</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="393"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/> <source>Back</source> <translation>Back</translation> </message> @@ -3900,6 +3948,11 @@ p, li { white-space: pre-wrap; } <source>Tags</source> <translation>Tags</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <source>Country</source> + <translation>Country</translation> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3923,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="216"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="241"/> <source>Dive site management</source> <translation>Dive site management</translation> </message> @@ -3945,7 +3998,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to continue?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="223"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="248"/> <source>You are editing a dive site</source> <translation>You are editing a dive site</translation> </message> @@ -4168,17 +4221,17 @@ p, li { white-space: pre-wrap; } <translation>Trip location</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="711"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> <source>New dive site</source> <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -4237,7 +4290,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="512"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> <source>Open</source> <translation>Open</translation> </message> @@ -4379,7 +4432,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/mainwindow.ui" line="380"/> <source>&Map</source> - <translation type="unfinished"/> + <translation>&Map</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="388"/> @@ -4533,13 +4586,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="226"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> <source>&Redo</source> <translation>&Redo</translation> </message> @@ -4579,166 +4632,166 @@ p, li { white-space: pre-wrap; } <translation>Take cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="326"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="503"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="548"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1576"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="509"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="513"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="622"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> <source>Traverse image directories</source> <translation>Traverse image directories</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="625"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="633"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> <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="587"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="659"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="805"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <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"/> <source>Warning</source> <translation>Warning</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="588"/> + <location filename="../desktop-widgets/divelistview.cpp" line="585"/> <source>Trying to merge dives with %1min interval in between</source> <translation>Trying to merge dives with %1min interval between them</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="684"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> <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="805"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="857"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="999"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1880"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Trying to edit a dive that's not a manually added dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1052"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1275"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1278"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1284"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1603"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1604"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1701"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1703"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1820"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1831"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1832"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -4748,7 +4801,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> <source>Drag the selected dive location</source> - <translation type="unfinished"/> + <translation>Drag the selected dive location</translation> </message> </context> <context> @@ -4756,21 +4809,30 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> - <translation type="unfinished"/> + <translation>Open location in Google Maps</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> - <translation type="unfinished"/> + <translation>Copy location to clipboard (decimal)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> - <translation type="unfinished"/> + <translation>Copy location to clipboard (sexagesimal)</translation> </message> <message> <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> + <translation>Select visible dive locations</translation> + </message> +</context> +<context> + <name>MapWidgetError</name> + <message> + <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <source>MapWidget.qml failed to load! +The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> </message> </context> @@ -4829,105 +4891,105 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="26"/> <source>Page 1</source> - <translation type="unfinished"/> + <translation>Page 1</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="37"/> <source>Text Field</source> - <translation type="unfinished"/> + <translation>Text field</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/Page1Form.ui.qml" line="42"/> <source>Press Me</source> - <translation type="unfinished"/> + <translation>Press me</translation> </message> </context> <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> <source>Open circuit</source> <translation>Open circuit</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="340"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="428"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="429"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="450"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="451"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="460"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> <source>psi</source> <translation>psi</translation> </message> @@ -5122,47 +5184,42 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Ceiling display setup</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="283"/> <source>Draw dive computer reported ceiling red</source> <translation>Draw dive computer reported ceiling red</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="217"/> <source>Algorithm for calculated ceiling:</source> <translation>Algorithm for calculated ceiling:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="257"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="334"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="327"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/> - <source>GFLow at max. depth</source> - <translation>GFLow at max. depth</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="320"/> <source>pSCR options:</source> <translation>pSCR options:</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="277"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="224"/> <source>Dilution ratio</source> <translation>Dilution ratio</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="227"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="197"/> <source>1:</source> <translation>1:</translation> </message> @@ -5202,7 +5259,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Dive planner default setpoint</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="184"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="247"/> <source>Conservatism level</source> <translation>Conservatism level</translation> </message> @@ -5212,38 +5269,38 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>B&ühlmann</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="290"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="254"/> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="321"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="234"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="307"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="267"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/> <source>Metabolic rate O₂</source> <translation>Metabolic rate O₂</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="314"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/> <source>&VPM-B</source> <translation>&VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="347"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="340"/> <source>Misc</source> <translation>Misc</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="346"/> <source>Show unused cylinders in Equipment tab</source> <translation>Show unused cylinders in Equipment tab</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="360"/> + <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="353"/> <source>Show mean depth in Profile</source> <translation>Show mean depth in Profile</translation> </message> @@ -5605,27 +5662,27 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="237"/> <source>Duration units</source> - <translation type="unfinished"/> + <translation>Duration units</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="243"/> <source>Show hours in duration</source> - <translation type="unfinished"/> + <translation>Show hours in duration</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="250"/> <source>hh:mm (always)</source> - <translation type="unfinished"/> + <translation>hh:mm (always)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="257"/> <source>mm (always)</source> - <translation type="unfinished"/> + <translation>mm (always)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="264"/> <source>mm (for dives shorter than 1 hour), hh:mm (otherwise)</source> - <translation type="unfinished"/> + <translation>mm (for dives shorter than 1 hour), hh:mm (otherwise)</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> @@ -5790,12 +5847,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Planned dive</source> - <translation type="unfinished"/> + <translation>Planned dive</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="780"/> <source>Manually added dive</source> - <translation type="unfinished"/> + <translation>Manually added dive</translation> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> @@ -5883,145 +5940,146 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <name>QMLManager</name> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> <source>Open local dive data file</source> - <translation type="unfinished"/> + <translation>Open local dive data file</translation> </message> <message> <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> <source>Opening local data file failed</source> - <translation type="unfinished"/> + <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> <source>%1 dives loaded from local dive data file</source> - <translation type="unfinished"/> + <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="240"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>Error parsing local storage, giving up</source> - <translation type="unfinished"/> + <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="249"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="250"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="321"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="289"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> - <translation type="unfinished"/> + <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="295"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> <source>Invalid format for email address</source> - <translation type="unfinished"/> + <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="335"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> <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="356"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> <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="378"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> <source>Incorrect cloud credentials</source> - <translation type="unfinished"/> + <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="384"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> <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="416"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="429"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> <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="442"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="454"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="478"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> <source>Cloud credentials valid, loading dives...</source> - <translation type="unfinished"/> + <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> <source>Loading dives from local storage ('no cloud' mode)</source> - <translation type="unfinished"/> + <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="578"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> <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="603"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="643"/> <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="773"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="774"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="775"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1162"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6160,22 +6218,22 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Maximum</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="637"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="638"/> <source>Invalid response from server</source> <translation>Invalid response from server</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="645"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="646"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="691"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>Expected XML tag 'DiveDates' not found</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="698"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="699"/> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> @@ -6262,76 +6320,126 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="13"/> <source>Settings</source> + <translation>Settings</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> + <source>Undefined</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> + <source>Incorrect username/password combination</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> + <source>Credentials need to be verified</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> + <source>Credentials verified</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> + <source>No cloud mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> + <source>Cloud status</source> <translation type="unfinished"/> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> - <source>Theme</source> + <source>Email</source> + <translation>Email</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> + <source>Not applicable</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="46"/> - <source>Blue</source> + <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> + <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="61"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="113"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="166"/> - <source>regular text</source> + <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> + <source>Status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="76"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="128"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="181"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="84"/> + <source>Theme</source> + <translation>Theme</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="92"/> + <source>Blue</source> + <translation>Blue</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="107"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="159"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="212"/> + <source>regular text</source> + <translation>regular text</translation> + </message> + <message> + <location filename="../mobile-widgets/qml/Settings.qml" line="122"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="174"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="227"/> <source>Highlight</source> - <translation type="unfinished"/> + <translation>Highlight</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="99"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="145"/> <source>Pink</source> - <translation type="unfinished"/> + <translation>Pink</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="151"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="197"/> <source>Dark</source> - <translation type="unfinished"/> + <translation>Dark</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="215"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="261"/> <source>Subsurface GPS data webservice</source> - <translation type="unfinished"/> + <translation>Subsurface GPS data webservice</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="224"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="270"/> <source>Distance threshold (meters)</source> - <translation type="unfinished"/> + <translation>Distance threshold (meters)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="240"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="286"/> <source>Time threshold (minutes)</source> - <translation type="unfinished"/> + <translation>Time threshold (minutes)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="267"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="313"/> <source>Dive computer</source> - <translation type="unfinished"/> + <translation>Dive computer</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="276"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="322"/> <source>Save detailed log</source> - <translation type="unfinished"/> + <translation>Save detailed log</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="299"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="345"/> <source>Developer</source> - <translation type="unfinished"/> + <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="308"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="354"/> <source>Display Developer menu</source> - <translation type="unfinished"/> + <translation>Display developer menu</translation> </message> </context> <context> @@ -6403,33 +6511,34 @@ Not all images have timestamps in the range between <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> <source>Image files (*.jpg *.jpeg)</source> - <translation type="unfinished"/> + <translation>Image files (*.jpg *.jpeg)</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> <source>Selected dive date/time</source> - <translation type="unfinished"/> + <translation>Selected dive date/time</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> <source>First selected dive date/time</source> - <translation type="unfinished"/> + <translation>First selected dive date/time</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="394"/> <source>Last selected dive date/time</source> - <translation type="unfinished"/> + <translation>Last selected dive date/time</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="396"/> <source> Files with inappropriate date/time</source> - <translation type="unfinished"/> + <translation> +Files with inappropriate date/time</translation> </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="406"/> <source>No Exif date/time found</source> - <translation type="unfinished"/> + <translation>No Exif date/time found</translation> </message> </context> <context> @@ -6543,54 +6652,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="307"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <source>Small</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <source>Medium</source> + <translation>Medium</translation> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> <source>Dive date: %1 </source> <translation>Dive date: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="310"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> <source>Duration: %1 </source> <translation>Duration: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="311"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="312"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="315"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive location: %1 </source> <translation>Dive location: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="318"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="321"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source> %1</source> <translation> @@ -6605,83 +6724,92 @@ Files with inappropriate date/time</source> <translation>Dialog</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="25"/> - <source>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</source> - <translation>The text to the right will be posted as the description with your profile picture to Facebook. The album name is required (the profile picture will be posted to that album).</translation> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> + <source>Small</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="38"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> + <source>Medium</source> + <translation>Medium</translation> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> + <source>Big</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> + <source>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</source> + <translation>The text to the right will be posted as the description with your dive profile graph to Facebook. The album name is required (the profile graph will be posted to that album).</translation> + </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="57"/> <source>Album</source> <translation>Album</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="45"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="64"/> <source>The profile picture will be posted in this album (required)</source> <translation>The profile picture will be posted in this album (required)</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="52"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="71"/> <source>Include</source> <translation>Include</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="59"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="78"/> <source>Date and time</source> <translation>Date and time</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="66"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="85"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="73"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="92"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="80"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="99"/> <source>Divemaster</source> <translation>Divemaster</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="87"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="106"/> <source>Buddy</source> <translation>Buddy</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="94"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="113"/> <source>Notes</source> <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="107"/> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="126"/> <source>Facebook post preview</source> <translation>Facebook post preview</translation> </message> + <message> + <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> + <source>Image Size</source> + <translation type="unfinished"/> + </message> </context> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="19"/> - <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. -</source> - <translation>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials. -</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/> - <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here. - -</source> - <translation>If this is the first time you've used Subsurface cloud storage, please enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will then send a PIN to the email address provided that you should enter here. - -</translation> + <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <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 type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/> - <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source> - <translation>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</translation> + <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <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 type="unfinished"/> </message> </context> <context> @@ -6720,47 +6848,47 @@ Files with inappropriate date/time</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="409"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="410"/> <source>Enter User ID and click Download</source> <translation>Enter User ID and click download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="431"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="432"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="517"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="518"/> <source>Connecting...</source> <translation>Connecting...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="536"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="537"/> <source>Download finished</source> <translation>Download finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="550"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> <source>Download error: %1</source> <translation>Download error: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="560"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="561"/> <source>Connection error: </source> <translation>Connection error: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="563"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="564"/> <source>Invalid user identifier!</source> <translation>Invalid user identifier.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="567"/> <source>Cannot parse response!</source> <translation>Cannot parse response.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="569"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="570"/> <source>Download successful</source> <translation>Download successful</translation> </message> @@ -6867,31 +6995,31 @@ Files with inappropriate date/time</source> <translation>Salinity</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="71"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="72"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="78"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="84"/> + <location filename="../desktop-widgets/tab-widgets/TabDiveInformation.cpp" line="85"/> <source>d</source> - <translation type="unfinished"/> + <translation>d</translation> </message> </context> <context> @@ -7077,7 +7205,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="133"/> <source>and</source> - <translation type="unfinished"/> + <translation>and</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/TabDiveStatistics.cpp" line="135"/> @@ -7320,107 +7448,112 @@ mixed from Air and using: <context> <name>TripItem</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="69"/> + <location filename="../qt-models/divetripmodel.cpp" line="72"/> <source>(%1 shown)</source> <translation>(%1 shown)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="212"/> + <location filename="../qt-models/divetripmodel.cpp" line="225"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="215"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="218"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="221"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="224"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="227"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="236"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="250"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="230"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="233"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="239"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="257"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="244"/> + <location filename="../qt-models/divetripmodel.cpp" line="257"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="247"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="253"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="256"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <source>Country</source> + <translation>Country</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Location</source> <translation>Location</translation> </message> @@ -7739,12 +7872,12 @@ Language: %1</translation> <translation>Upload</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="338"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="339"/> <source>Operation timed out</source> <translation>Operation timed out</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="359"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="360"/> <source>Transferring data...</source> <translation>Transferring data...</translation> </message> @@ -7770,8 +7903,8 @@ Language: %1</translation> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="533"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="564"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> <source>No error</source> <translation>No error</translation> </message> @@ -7895,7 +8028,7 @@ Maximum</translation> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="790"/> + <location filename="../core/libdivecomputer.c" line="791"/> <source>Error parsing the header</source> <translation>Error parsing the header</translation> </message> @@ -7903,10 +8036,11 @@ Maximum</translation> <context> <name>gettectFromC</name> <message> - <location filename="../core/profile.c" line="1363"/> + <location filename="../core/profile.c" line="1364"/> <source>Density: %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>Density: %.1fg/ℓ +</translation> </message> </context> <context> @@ -7915,7 +8049,7 @@ Maximum</translation> <location filename="../core/cochran.c" line="304"/> <location filename="../core/cochran.c" line="310"/> <location filename="../core/cochran.c" line="380"/> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>deco stop</source> <translation>deco stop</translation> </message> @@ -7923,7 +8057,7 @@ Maximum</translation> <location filename="../core/cochran.c" line="331"/> <location filename="../core/cochran.c" line="385"/> <location filename="../core/file.c" line="771"/> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>ascent</source> <translation>ascent</translation> </message> @@ -7935,20 +8069,20 @@ Maximum</translation> </message> <message> <location filename="../core/cochran.c" line="343"/> - <location filename="../core/libdivecomputer.c" line="270"/> + <location filename="../core/libdivecomputer.c" line="271"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="269"/> + <location filename="../core/libdivecomputer.c" line="270"/> <source>maxdepth</source> <translation>maxdepth</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> <location filename="../core/cochran.c" line="399"/> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="272"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7957,28 +8091,28 @@ Maximum</translation> <location filename="../core/cochran.c" line="409"/> <location filename="../core/cochran.c" line="416"/> <location filename="../core/file.c" line="852"/> - <location filename="../core/libdivecomputer.c" line="262"/> - <location filename="../core/libdivecomputer.c" line="276"/> + <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="277"/> <source>gaschange</source> <translation>gas change</translation> </message> <message> <location filename="../core/cochran.c" line="365"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../core/cochran.c" line="374"/> <location filename="../core/cochran.c" line="421"/> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> <location filename="../core/cochran.c" line="390"/> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>transmitter</source> <translation>transmitter</translation> </message> @@ -8165,17 +8299,18 @@ Maximum</translation> <location filename="../core/datatrak.c" line="513"/> <source>[Warning] Manual dive # %d </source> - <translation type="unfinished"/> + <translation>[Warning] Manual dive # %d +</translation> </message> <message> <location filename="../core/datatrak.c" line="539"/> <source>[Error] Out of memory for dive %d. Abort parsing.</source> - <translation type="unfinished"/> + <translation>[Error] Out of memory for dive %d. Abort parsing.</translation> </message> <message> <location filename="../core/datatrak.c" line="585"/> <source>[Error] File is not a DataTrak file. Aborted</source> - <translation type="unfinished"/> + <translation>[Error] File is not a DataTrak file. Aborted</translation> </message> <message> <location filename="../core/datatrak.c" line="598"/> @@ -8240,8 +8375,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1126"/> - <location filename="../core/planner.c" line="1129"/> + <location filename="../core/planner.c" line="1124"/> + <location filename="../core/planner.c" line="1127"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8331,10 +8466,10 @@ Maximum</translation> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="498"/> + <location filename="../core/divelist.c" line="497"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1122"/> - <location filename="../core/planner.c" line="1125"/> + <location filename="../core/planner.c" line="1120"/> + <location filename="../core/planner.c" line="1123"/> <source>air</source> <translation>air</translation> </message> @@ -8438,22 +8573,22 @@ Maximum</translation> <message> <location filename="../core/file.c" line="950"/> <source>No dive profile found from '%s'</source> - <translation type="unfinished"/> + <translation>No dive profile found from '%s'</translation> </message> <message> <location filename="../core/git-access.c" line="56"/> <source>Checkout from storage (%lu/%lu)</source> - <translation type="unfinished"/> + <translation>Checkout from storage (%lu/%lu)</translation> </message> <message> <location filename="../core/git-access.c" line="87"/> <source>Transfer from storage (%d/%d)</source> - <translation type="unfinished"/> + <translation>Transfer from storage (%d/%d)</translation> </message> <message> <location filename="../core/git-access.c" line="99"/> <source>Transfer to storage (%d/%d)</source> - <translation type="unfinished"/> + <translation>Transfer to storage (%d/%d)</translation> </message> <message> <location filename="../core/git-access.c" line="135"/> @@ -8509,42 +8644,42 @@ Maximum</translation> <message> <location filename="../core/git-access.c" line="469"/> <source>Update local storage to match cloud storage</source> - <translation type="unfinished"/> + <translation>Update local storage to match cloud storage</translation> </message> <message> <location filename="../core/git-access.c" line="477"/> <source>Push local changes to cloud storage</source> - <translation type="unfinished"/> + <translation>Push local changes to cloud storage</translation> </message> <message> <location filename="../core/git-access.c" line="495"/> <source>Try to merge local changes into cloud storage</source> - <translation type="unfinished"/> + <translation>Try to merge local changes into cloud storage</translation> </message> <message> <location filename="../core/git-access.c" line="537"/> <source>Store data into cloud storage</source> - <translation type="unfinished"/> + <translation>Store data into cloud storage</translation> </message> <message> <location filename="../core/git-access.c" line="561"/> <source>Sync with cloud storage</source> - <translation type="unfinished"/> + <translation>Sync with cloud storage</translation> </message> <message> <location filename="../core/git-access.c" line="588"/> <source>Can't reach cloud server, working with local data</source> - <translation type="unfinished"/> + <translation>Can't reach cloud server, working with local data</translation> </message> <message> <location filename="../core/git-access.c" line="601"/> <source>Successful cloud connection, fetch remote</source> - <translation type="unfinished"/> + <translation>Successful cloud connection, fetch remote</translation> </message> <message> <location filename="../core/git-access.c" line="616"/> <source>Done syncing with cloud storage</source> - <translation type="unfinished"/> + <translation>Done syncing with cloud storage</translation> </message> <message> <location filename="../core/git-access.c" line="752"/> @@ -8559,216 +8694,223 @@ Maximum</translation> <message> <location filename="../core/git-access.c" line="778"/> <source>Synchronising data file</source> - <translation type="unfinished"/> + <translation>Synchronising data file</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="238"/> - <location filename="../core/parse-xml.c" line="3456"/> + <location filename="../core/libdivecomputer.c" line="239"/> + <location filename="../core/parse-xml.c" line="3457"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="251"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>none</source> <translation>none</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>workload</source> <translation>workload</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="260"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="261"/> + <location filename="../core/libdivecomputer.c" line="262"/> <source>safety stop</source> <translation>safety stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="263"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>safety stop (voluntary)</source> <translation>safety stop (recommended)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>safety stop (mandatory)</source> <translation>safety stop (mandatory)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>deepstop</source> <translation>deep stop</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="267"/> <source>ceiling (safety stop)</source> <translation>ceiling (safety stop)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="267"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="268"/> + <location filename="../core/libdivecomputer.c" line="269"/> <source>divetime</source> <translation>divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="272"/> + <location filename="../core/libdivecomputer.c" line="273"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="274"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/libdivecomputer.c" line="275"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="275"/> + <location filename="../core/libdivecomputer.c" line="276"/> <source>tissue level warning</source> <translation>tissue level warning</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="285"/> + <location filename="../core/libdivecomputer.c" line="286"/> <source>invalid event number</source> <translation>invalid event number</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="607"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="624"/> + <location filename="../core/libdivecomputer.c" line="625"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="630"/> + <location filename="../core/libdivecomputer.c" line="631"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="640"/> + <location filename="../core/libdivecomputer.c" line="641"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="659"/> + <location filename="../core/libdivecomputer.c" line="660"/> <source>Error parsing temperature</source> <translation>Error parsing temperature</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="679"/> + <location filename="../core/libdivecomputer.c" line="680"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="691"/> + <location filename="../core/libdivecomputer.c" line="692"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="700"/> + <location filename="../core/libdivecomputer.c" line="701"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="725"/> + <location filename="../core/libdivecomputer.c" line="726"/> <source>Error obtaining dive mode</source> <translation>Error obtaining dive mode</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="745"/> + <location filename="../core/libdivecomputer.c" line="746"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="770"/> + <location filename="../core/libdivecomputer.c" line="771"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="776"/> + <location filename="../core/libdivecomputer.c" line="777"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="797"/> + <location filename="../core/libdivecomputer.c" line="798"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="804"/> + <location filename="../core/libdivecomputer.c" line="805"/> <source>Already downloaded dive at %s</source> - <translation type="unfinished"/> + <translation>Already downloaded dive at %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="938"/> + <location filename="../core/libdivecomputer.c" line="939"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="957"/> + <location filename="../core/libdivecomputer.c" line="958"/> <source>model=%s firmware=%u serial=%u</source> - <translation type="unfinished"/> + <translation>model=%s firmware=%u serial=%u</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1020"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1024"/> + <location filename="../core/libdivecomputer.c" line="1025"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1045"/> + <location filename="../core/libdivecomputer.c" line="1046"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1084"/> + <location filename="../core/libdivecomputer.c" line="1085"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1091"/> + <location filename="../core/libdivecomputer.c" line="1094"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1116"/> + <location filename="../core/libdivecomputer.c" line="1119"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> - <translation type="unfinished"/> + <translation>Error opening the device %s %s (%s). +In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. +You can create this logfile by selecting the corresponding checkbox in the download dialog.</translation> + </message> + <message> + <location filename="../core/libdivecomputer.c" line="1128"/> + <source>No new dives downloaded from dive computer</source> + <translation>No new dives downloaded from dive computer</translation> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1270"/> + <location filename="../core/parse-xml.c" line="1271"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s @@ -8776,7 +8918,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1332"/> + <location filename="../core/parse-xml.c" line="1333"/> <source>additional name for site: %s </source> <translation>additional name for site: %s @@ -8785,12 +8927,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/load-git.c" line="1703"/> <source>Load dives from local cache</source> - <translation type="unfinished"/> + <translation>Load dives from local cache</translation> </message> <message> <location filename="../core/load-git.c" line="1707"/> <source>Successfully opened dive data</source> - <translation type="unfinished"/> + <translation>Successfully opened dive data</translation> </message> <message> <location filename="../core/ostctools.c" line="93"/> @@ -8811,12 +8953,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2094"/> + <location filename="../core/parse-xml.c" line="2095"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3978"/> + <location filename="../core/parse-xml.c" line="3979"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -8832,21 +8974,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="387"/> - <location filename="../core/plannernotes.c" line="393"/> - <location filename="../core/plannernotes.c" line="425"/> - <location filename="../core/plannernotes.c" line="460"/> - <location filename="../core/plannernotes.c" line="472"/> + <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"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="328"/> + <location filename="../core/plannernotes.c" line="333"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="320"/> + <location filename="../core/planner.c" line="318"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP change</translation> @@ -8862,93 +9004,93 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="109"/> + <location filename="../core/plannernotes.c" line="108"/> + <source>Runtime: %dmin<br></div></source> + <translation>Runtime: %dmin<br></div></translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../core/plannernotes.c" line="112"/> + <location filename="../core/plannernotes.c" line="117"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../core/plannernotes.c" line="115"/> + <location filename="../core/plannernotes.c" line="120"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="118"/> + <location filename="../core/plannernotes.c" line="123"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="165"/> + <location filename="../core/plannernotes.c" line="170"/> <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="173"/> + <location filename="../core/plannernotes.c" line="178"/> <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="186"/> + <location filename="../core/plannernotes.c" line="191"/> <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="193"/> + <location filename="../core/plannernotes.c" line="198"/> <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="239"/> + <location filename="../core/plannernotes.c" line="244"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="242"/> - <location filename="../core/plannernotes.c" line="246"/> + <location filename="../core/plannernotes.c" line="247"/> + <location filename="../core/plannernotes.c" line="251"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="255"/> - <location filename="../core/plannernotes.c" line="267"/> + <location filename="../core/plannernotes.c" line="260"/> + <location filename="../core/plannernotes.c" line="272"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="290"/> + <location filename="../core/plannernotes.c" line="295"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="292"/> + <location filename="../core/plannernotes.c" line="297"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="312"/> + <location filename="../core/plannernotes.c" line="317"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="314"/> + <location filename="../core/plannernotes.c" line="319"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="329"/> <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="418"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="98"/> <source>Subsurface</source> @@ -8970,87 +9112,92 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>dive plan</b> created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="104"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> + <translation>Runtime: %dmin VARIATIONS<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="324"/> <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="326"/> + <location filename="../core/plannernotes.c" line="331"/> <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="332"/> + <location filename="../core/plannernotes.c" line="337"/> <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="340"/> + <location filename="../core/plannernotes.c" line="345"/> <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="358"/> + <location filename="../core/plannernotes.c" line="363"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="360"/> + <location filename="../core/plannernotes.c" line="365"/> <source>Gas consumption (based on SAC</source> <translation>Gas consumption (based on SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="388"/> + <location filename="../core/plannernotes.c" line="393"/> <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="394"/> + <location filename="../core/plannernotes.c" line="399"/> <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="426"/> + <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 type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="432"/> <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="429"/> + <location filename="../core/plannernotes.c" line="435"/> <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="432"/> + <location filename="../core/plannernotes.c" line="438"/> <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="457"/> + <location filename="../core/plannernotes.c" line="463"/> <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="469"/> + <location filename="../core/plannernotes.c" line="475"/> <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="873"/> + <location filename="../core/planner.c" line="871"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1130"/> + <location filename="../core/planner.c" line="1128"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1316"/> + <location filename="../core/profile.c" line="1317"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9059,251 +9206,256 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1328"/> + <location filename="../core/profile.c" line="1329"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1334"/> + <location filename="../core/profile.c" line="1335"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1337"/> + <location filename="../core/profile.c" line="1338"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../core/profile.c" line="1339"/> + <location filename="../core/profile.c" line="1340"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1341"/> + <location filename="../core/profile.c" line="1342"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1343"/> + <location filename="../core/profile.c" line="1344"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1345"/> + <location filename="../core/profile.c" line="1346"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../core/profile.c" line="1348"/> + <location filename="../core/profile.c" line="1349"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1382"/> + <location filename="../core/profile.c" line="1383"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1374"/> + <location filename="../core/profile.c" line="1375"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Safety stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1324"/> + <location filename="../core/profile.c" line="1325"/> <source>P: %d%s (%s) </source> - <translation type="unfinished"/> + <translation>P: %d%s (%s) +</translation> </message> <message> - <location filename="../core/profile.c" line="1356"/> + <location filename="../core/profile.c" line="1357"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>EAD: %d%s +EADD: %d%s / %.1fg/ℓ +</translation> </message> <message> - <location filename="../core/profile.c" line="1360"/> + <location filename="../core/profile.c" line="1361"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> - <translation type="unfinished"/> + <translation>END: %d%s +EADD: %d%s / %.1fg/ℓ +</translation> </message> <message> - <location filename="../core/profile.c" line="1377"/> + <location filename="../core/profile.c" line="1378"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Safety stop: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1385"/> + <location filename="../core/profile.c" line="1386"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Deco: unknown time @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1389"/> + <location filename="../core/profile.c" line="1390"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../core/profile.c" line="1391"/> + <location filename="../core/profile.c" line="1392"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1394"/> + <location filename="../core/profile.c" line="1395"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1397"/> + <location filename="../core/profile.c" line="1398"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1405"/> + <location filename="../core/profile.c" line="1406"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1408"/> + <location filename="../core/profile.c" line="1409"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1410"/> + <location filename="../core/profile.c" line="1411"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1414"/> + <location filename="../core/profile.c" line="1415"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1416"/> + <location filename="../core/profile.c" line="1417"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2h (calc) </translation> </message> <message> - <location filename="../core/profile.c" line="1419"/> + <location filename="../core/profile.c" line="1420"/> <source>RBT: %umin </source> <translation>RBT: %umin </translation> </message> <message> - <location filename="../core/profile.c" line="1422"/> + <location filename="../core/profile.c" line="1423"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1428"/> + <location filename="../core/profile.c" line="1429"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Tissue %.0fmin: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1434"/> + <location filename="../core/profile.c" line="1435"/> <source>heart rate: %d </source> <translation>heart rate: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1436"/> + <location filename="../core/profile.c" line="1437"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1439"/> + <location filename="../core/profile.c" line="1440"/> <source>mean depth to here %.1f%s </source> <translation>mean depth to here %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1535"/> + <location filename="../core/profile.c" line="1536"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1539"/> - <location filename="../core/profile.c" line="1543"/> - <location filename="../core/profile.c" line="1547"/> + <location filename="../core/profile.c" line="1540"/> + <location filename="../core/profile.c" line="1544"/> + <location filename="../core/profile.c" line="1548"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1551"/> + <location filename="../core/profile.c" line="1552"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1555"/> + <location filename="../core/profile.c" line="1556"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1559"/> - <location filename="../core/profile.c" line="1563"/> + <location filename="../core/profile.c" line="1560"/> + <location filename="../core/profile.c" line="1564"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1570"/> + <location filename="../core/profile.c" line="1571"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1595"/> + <location filename="../core/profile.c" line="1596"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -9364,7 +9516,7 @@ EADD: %d%s / %.1fg/ℓ <message> <location filename="../core/qthelper.cpp" line="965"/> <source>more than %1 days</source> - <translation type="unfinished"/> + <translation>more than %1 days</translation> </message> <message> <location filename="../core/save-html.c" line="472"/> @@ -9677,97 +9829,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(no dives)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="133"/> + <location filename="../core/subsurfacestartup.c" line="134"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="142"/> + <location filename="../core/subsurfacestartup.c" line="143"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="144"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10107,59 +10259,59 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>planned waypoint above ceiling</translation> </message> <message> - <location filename="../core/taxonomy.c" line="7"/> + <location filename="../core/taxonomy.c" line="8"/> <source>None</source> <translation>None</translation> </message> <message> - <location filename="../core/taxonomy.c" line="8"/> + <location filename="../core/taxonomy.c" line="9"/> <source>Ocean</source> <translation>Ocean</translation> </message> <message> - <location filename="../core/taxonomy.c" line="9"/> + <location filename="../core/taxonomy.c" line="10"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../core/taxonomy.c" line="10"/> + <location filename="../core/taxonomy.c" line="11"/> <source>State</source> <translation>State</translation> </message> <message> - <location filename="../core/taxonomy.c" line="11"/> + <location filename="../core/taxonomy.c" line="12"/> <source>County</source> <translation>County</translation> </message> <message> - <location filename="../core/taxonomy.c" line="12"/> + <location filename="../core/taxonomy.c" line="13"/> <source>Town</source> <translation>Town</translation> </message> <message> - <location filename="../core/taxonomy.c" line="13"/> + <location filename="../core/taxonomy.c" line="14"/> <source>City</source> <translation>City</translation> </message> <message> <location filename="../core/save-git.c" line="985"/> <source>Start saving data</source> - <translation type="unfinished"/> + <translation>Start saving data</translation> </message> <message> <location filename="../core/save-git.c" line="994"/> <source>Start saving dives</source> - <translation type="unfinished"/> + <translation>Start saving dives</translation> </message> <message> <location filename="../core/save-git.c" line="1027"/> <source>Done creating local cache</source> - <translation type="unfinished"/> + <translation>Done creating local cache</translation> </message> <message> <location filename="../core/save-git.c" line="1258"/> <source>Preparing to save data</source> - <translation type="unfinished"/> + <translation>Preparing to save data</translation> </message> </context> <context> @@ -10182,15 +10334,15 @@ Is the Uemis Zurich plugged in correctly?</translation> <message> <location filename="../mobile-widgets/qml/main.qml" line="133"/> <source>Dive management</source> - <translation type="unfinished"/> + <translation>Dive management</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="233"/> + <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Disable location service</source> - <translation type="unfinished"/> + <translation>Disable location service</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="249"/> + <location filename="../mobile-widgets/qml/main.qml" line="250"/> <source>Settings</source> <translation>Settings</translation> </message> @@ -10200,94 +10352,94 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Add dive manually</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="145"/> + <location filename="../mobile-widgets/qml/main.qml" line="146"/> <source>Download from DC</source> - <translation type="unfinished"/> + <translation>Download from DC</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="154"/> + <location filename="../mobile-widgets/qml/main.qml" line="155"/> <source>Apply GPS Fixes</source> - <translation type="unfinished"/> + <translation>Apply GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="161"/> + <location filename="../mobile-widgets/qml/main.qml" line="162"/> <source>Manual sync with cloud</source> <translation>Manual sync with cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="180"/> + <location filename="../mobile-widgets/qml/main.qml" line="181"/> <source>Offline mode</source> <translation>Offline mode</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="180"/> + <location filename="../mobile-widgets/qml/main.qml" line="181"/> <source>Enable auto cloud sync</source> <translation>Enable auto cloud sync</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <location filename="../mobile-widgets/qml/main.qml" line="186"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> - <translation type="unfinished"/> + <translation>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="194"/> + <location filename="../mobile-widgets/qml/main.qml" line="195"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="275"/> + <location filename="../mobile-widgets/qml/main.qml" line="276"/> <source>Help</source> - <translation type="unfinished"/> + <translation>Help</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="200"/> <source>Upload GPS data</source> <translation>Upload GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="207"/> + <location filename="../mobile-widgets/qml/main.qml" line="208"/> <source>Download GPS data</source> <translation>Download GPS data</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="215"/> + <location filename="../mobile-widgets/qml/main.qml" line="216"/> <source>Show GPS fixes</source> <translation>Show GPS fixes</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="225"/> + <location filename="../mobile-widgets/qml/main.qml" line="226"/> <source>Clear GPS cache</source> <translation>Clear GPS cache</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="257"/> + <location filename="../mobile-widgets/qml/main.qml" line="258"/> <source>Developer</source> <translation>Developer</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="260"/> + <location filename="../mobile-widgets/qml/main.qml" line="261"/> <source>App log</source> <translation>App log</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="267"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>Theme information</source> <translation>Theme information</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="241"/> + <location filename="../mobile-widgets/qml/main.qml" line="242"/> <source>About</source> <translation>About</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="233"/> + <location filename="../mobile-widgets/qml/main.qml" line="234"/> <source>Run location service</source> <translation>Run location service</translation> </message> <message> <location filename="../mobile-widgets/qml/kirigami/examples/minimalqmake/main.qml" line="28"/> <source>Hello World</source> - <translation type="unfinished"/> + <translation>Hello World</translation> </message> </context> <context> @@ -10427,7 +10579,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="780"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> <source>min</source> <translation>min</translation> </message> @@ -10488,22 +10640,32 @@ p, li { white-space: pre-wrap; } <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <source>Compute variations of plan (performance cost)</source> + <translation>Compute variations of plan (performance cost)</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <source>Display plan variations</source> + <translation>Display plan variations</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>SAC factor</source> <translation>SAC factor</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="748"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="770"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> <source>Problem solving time</source> <translation>Problem solving time</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="777"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Used to calculate minimum gas. Additional time at max. depth after OoG event.</translation> </message> @@ -10543,42 +10705,42 @@ p, li { white-space: pre-wrap; } <translation>Notes</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>In dive plan, show runtime (absolute time) of stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="694"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> <source>Display runtime</source> <translation>Display runtime</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="704"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>In dive plan, show duration (relative time) of stops</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="707"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> <source>Display segment duration</source> <translation>Display segment duration</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="714"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>In dive plan, list transitions or treat them as implicit</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="717"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> <source>Display transitions in deco</source> <translation>Display transitions in deco</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> <source>Verbatim dive plan</source> <translation>Verbatim dive plan</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> <source>Deco pO₂</source> <translation>Deco pO₂</translation> </message> |