diff options
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 326 |
1 files changed, 175 insertions, 151 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index e47c8499b..d1f4ebb41 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -36,7 +36,7 @@ <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/BackButton.qml" line="54"/> <source>Navigate Back</source> - <translation type="unfinished"/> + <translation>Navigate back</translation> </message> </context> <context> @@ -359,7 +359,7 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="107"/> <source>Register</source> - <translation type="unfinished"/> + <translation>Register</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="118"/> @@ -369,12 +369,12 @@ <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="135"/> <source>Sign-in or Register</source> - <translation type="unfinished"/> + <translation>Sign-in or register</translation> </message> <message> <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="146"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>No cloud mode</translation> </message> </context> <context> @@ -1931,7 +1931,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> <source>Cancel edit</source> - <translation type="unfinished"/> + <translation>Cancel edit</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> @@ -2301,12 +2301,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="361"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> <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="362"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -3191,142 +3191,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="450"/> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="478"/> + <location filename="../qt-models/divetripmodel.cpp" line="530"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="453"/> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="533"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="456"/> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="536"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="459"/> + <location filename="../qt-models/divetripmodel.cpp" line="487"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="462"/> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="490"/> + <location filename="../qt-models/divetripmodel.cpp" line="542"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="468"/> + <location filename="../qt-models/divetripmodel.cpp" line="496"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="471"/> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> + <location filename="../qt-models/divetripmodel.cpp" line="551"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="465"/> + <location filename="../qt-models/divetripmodel.cpp" line="493"/> <source>Temp.</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="474"/> - <location filename="../qt-models/divetripmodel.cpp" line="526"/> + <location filename="../qt-models/divetripmodel.cpp" line="502"/> + <location filename="../qt-models/divetripmodel.cpp" line="554"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="477"/> - <location filename="../qt-models/divetripmodel.cpp" line="529"/> + <location filename="../qt-models/divetripmodel.cpp" line="505"/> + <location filename="../qt-models/divetripmodel.cpp" line="557"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="508"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="483"/> - <location filename="../qt-models/divetripmodel.cpp" line="537"/> + <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="565"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="486"/> - <location filename="../qt-models/divetripmodel.cpp" line="540"/> + <location filename="../qt-models/divetripmodel.cpp" line="514"/> + <location filename="../qt-models/divetripmodel.cpp" line="568"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="517"/> <source>Photos</source> <translation>Photos</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="492"/> + <location filename="../qt-models/divetripmodel.cpp" line="520"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="495"/> - <location filename="../qt-models/divetripmodel.cpp" line="546"/> + <location filename="../qt-models/divetripmodel.cpp" line="523"/> + <location filename="../qt-models/divetripmodel.cpp" line="574"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> + <location filename="../qt-models/divetripmodel.cpp" line="539"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="545"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="534"/> + <location filename="../qt-models/divetripmodel.cpp" line="562"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="543"/> + <location filename="../qt-models/divetripmodel.cpp" line="571"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> @@ -3712,22 +3712,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> <source>Facebook logged in successfully</source> - <translation type="unfinished"/> + <translation>Facebook logged in successfully</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> <source>Error, unknown user id, cannot login.</source> - <translation type="unfinished"/> + <translation>Error, unknown user id, cannot login.</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> <source>Dive uploaded successfully to Facebook</source> - <translation type="unfinished"/> + <translation>Dive uploaded successfully to Facebook</translation> </message> <message> <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"/> + <translation>Dive upload failed. Please see debug output and send to Subsurface mailing list</translation> </message> </context> <context> @@ -3792,7 +3792,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/templates/private/ForwardButton.qml" line="50"/> <source>Navigate Forward</source> - <translation type="unfinished"/> + <translation>Navigate forward</translation> </message> </context> <context> @@ -3929,27 +3929,27 @@ p, li { white-space: pre-wrap; } <translation>Coordinates</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="69"/> + <location filename="../desktop-widgets/locationInformation.ui" line="73"/> <source>Reverse geo lookup</source> <translation>Reverse geolocation lookup</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="72"/> + <location filename="../desktop-widgets/locationInformation.ui" line="76"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="93"/> + <location filename="../desktop-widgets/locationInformation.ui" line="97"/> <source>Dive sites on same coordinates</source> <translation>Dive sites on same coordinates</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="131"/> + <location filename="../desktop-widgets/locationInformation.ui" line="138"/> <source>Tags</source> <translation>Tags</translation> </message> <message> - <location filename="../desktop-widgets/locationInformation.ui" line="145"/> + <location filename="../desktop-widgets/locationInformation.ui" line="152"/> <source>Country</source> <translation>Country</translation> </message> @@ -3976,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="241"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> <source>Dive site management</source> <translation>Dive site management</translation> </message> @@ -3998,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="248"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> <source>You are editing a dive site</source> <translation>You are editing a dive site</translation> </message> @@ -4833,7 +4833,8 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <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"/> + <translation>MapWidget.qml failed to load! +The QML modules QtPositioning and QtLocation could be missing!</translation> </message> </context> <context> @@ -4922,74 +4923,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="430"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="431"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="432"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="438"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="444"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="452"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="453"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> <source>psi</source> <translation>psi</translation> </message> @@ -5686,21 +5687,31 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> + <source>Dive list table</source> + <translation>Dive list table</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <source>Show units in dive list table</source> + <translation>Show units in dive list table</translation> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> <source>GPS coordinates</source> <translation>GPS coordinates</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="296"/> <source>Location Display</source> <translation>Location display</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="287"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="303"/> <source>traditional (dms)</source> <translation>deg/min/sec</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_units.ui" line="294"/> + <location filename="../desktop-widgets/preferences/preferences_units.ui" line="310"/> <source>decimal</source> <translation>decimal</translation> </message> @@ -5939,147 +5950,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="113"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="247"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="166"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="174"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="197"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> <source>Error parsing local storage, giving up</source> <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="327"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="375"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> <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="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="410"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> <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="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="424"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> <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="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> <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="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="494"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="518"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="530"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="618"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> <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="643"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <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="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="814"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="815"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="813"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6325,32 +6336,32 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="16"/> <source>Undefined</source> - <translation type="unfinished"/> + <translation>Undefined</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="17"/> <source>Incorrect username/password combination</source> - <translation type="unfinished"/> + <translation>Incorrect username/password combination</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="18"/> <source>Credentials need to be verified</source> - <translation type="unfinished"/> + <translation>Credentials need to be verified</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="19"/> <source>Credentials verified</source> - <translation type="unfinished"/> + <translation>Credentials verified</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="20"/> <source>No cloud mode</source> - <translation type="unfinished"/> + <translation>No cloud mode</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="30"/> <source>Cloud status</source> - <translation type="unfinished"/> + <translation>Cloud status</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="38"/> @@ -6360,17 +6371,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="44"/> <source>Not applicable</source> - <translation type="unfinished"/> + <translation>Not applicable</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="52"/> <source>Change</source> - <translation type="unfinished"/> + <translation>Change</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="59"/> <source>Status</source> - <translation type="unfinished"/> + <translation>Status</translation> </message> <message> <location filename="../mobile-widgets/qml/Settings.qml" line="84"/> @@ -6654,7 +6665,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Small</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> @@ -6726,7 +6737,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="26"/> <source>Small</source> - <translation type="unfinished"/> + <translation>Small</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="31"/> @@ -6736,7 +6747,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="36"/> <source>Big</source> - <translation type="unfinished"/> + <translation>Big</translation> </message> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="44"/> @@ -6796,7 +6807,7 @@ Files with inappropriate date/time</translation> <message> <location filename="../desktop-widgets/plugins/facebook/socialnetworksdialog.ui" line="136"/> <source>Image Size</source> - <translation type="unfinished"/> + <translation>Image size</translation> </message> </context> <context> @@ -6804,12 +6815,12 @@ Files with inappropriate date/time</translation> <message> <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"/> + <translation>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is your first time using Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud button above.</translation> </message> <message> <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> <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"/> + <translation>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> </context> <context> @@ -7453,107 +7464,120 @@ mixed from Air and using: <translation>(%1 shown)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="225"/> + <location filename="../qt-models/divetripmodel.cpp" line="228"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="228"/> + <location filename="../qt-models/divetripmodel.cpp" line="231"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="231"/> + <location filename="../qt-models/divetripmodel.cpp" line="234"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="234"/> + <location filename="../qt-models/divetripmodel.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="237"/> + <location filename="../qt-models/divetripmodel.cpp" line="240"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="240"/> + <location filename="../qt-models/divetripmodel.cpp" line="243"/> <source>Temp.(%1%2)</source> <translation>Temp.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="249"/> + <location filename="../qt-models/divetripmodel.cpp" line="252"/> <source>Cylinder</source> <translation>Cylinder</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="263"/> + <location filename="../qt-models/divetripmodel.cpp" line="266"/> <source>Max. CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>h</source> + <translation>h</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <source>min</source> + <translation>min</translation> + </message> + <message> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="243"/> + <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="246"/> + <location filename="../qt-models/divetripmodel.cpp" line="249"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="252"/> + <location filename="../qt-models/divetripmodel.cpp" line="255"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="257"/> + <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="410"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="260"/> + <location filename="../qt-models/divetripmodel.cpp" line="263"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="266"/> + <location filename="../qt-models/divetripmodel.cpp" line="269"/> <source>Photos before/during/after dive</source> <translation>Photos before/during/after dive</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="269"/> + <location filename="../qt-models/divetripmodel.cpp" line="272"/> <source>Country</source> <translation>Country</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="272"/> + <location filename="../qt-models/divetripmodel.cpp" line="275"/> <source>Location</source> <translation>Location</translation> </message> @@ -8698,7 +8722,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3457"/> + <location filename="../core/parse-xml.c" line="3475"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unknown</translation> @@ -8910,7 +8934,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1271"/> + <location filename="../core/parse-xml.c" line="1275"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>multiple GPS locations for this dive site; also %s @@ -8918,7 +8942,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="1333"/> + <location filename="../core/parse-xml.c" line="1337"/> <source>additional name for site: %s </source> <translation>additional name for site: %s @@ -8946,19 +8970,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Error - %s - parsing dive %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="524"/> + <location filename="../core/parse-xml.c" line="528"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2095"/> + <location filename="../core/parse-xml.c" line="2099"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3979"/> + <location filename="../core/parse-xml.c" line="3997"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -9159,7 +9183,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <message> <location filename="../core/plannernotes.c" line="421"/> <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> + <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> </message> <message> <location filename="../core/plannernotes.c" line="432"/> |