diff options
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 798 |
1 files changed, 427 insertions, 371 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 259f1bcb6..62f3bb4bb 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -48,34 +48,14 @@ <translation>Clicking here will remove this cylinder.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="358"/> + <location filename="../qt-ui/models.cpp" line="365"/> <source>Cylinder cannot be removed</source> <translation>Cylinder cannot be removed</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="359"/> - <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> - <translation>This gas in use. Only cylinders that are not used in the dive can be removed.</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="507"/> - <source>psi</source> - <translation>psi</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="508"/> - <source>bar</source> - <translation>bar</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="532"/> - <source>l</source> - <translation>l</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="533"/> - <source>cuft</source> - <translation>cuft</translation> + <location filename="../qt-ui/models.cpp" line="366"/> + <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> + <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation> </message> </context> <context> @@ -101,22 +81,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Device ID</source> <translation>Device ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> + <location filename="../qt-ui/models.cpp" line="1421"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1442"/> + <location filename="../qt-ui/models.cpp" line="1452"/> <source>Clicking here will remove this dive computer.</source> <translation>Clicking here will remove this dive computer.</translation> </message> @@ -144,7 +124,7 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> @@ -157,87 +137,87 @@ <translation>Show search box</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="705"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="706"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="708"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="711"/> + <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="725"/> + <location filename="../qt-ui/divelistview.cpp" line="724"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="727"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="730"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="732"/> + <location filename="../qt-ui/divelistview.cpp" line="731"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="736"/> + <location filename="../qt-ui/divelistview.cpp" line="735"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="738"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="742"/> + <location filename="../qt-ui/divelistview.cpp" line="741"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="744"/> <source>Shift times</source> <translation>Shift times</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="746"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Load images</source> <translation>Load images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="767"/> + <location filename="../qt-ui/divelistview.cpp" line="766"/> <source>Open image files</source> <translation>Open image files</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="767"/> + <location filename="../qt-ui/divelistview.cpp" line="766"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -392,12 +372,12 @@ <translation>Sand</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="155"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/> <source>UDDF files (*.uddf *.UDDF)</source> <translation>UDDF files (*.uddf *.UDDF)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="159"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="162"/> <source>CSV files (*.csv *.CSV)</source> <translation>CSV files (*.csv *.CSV)</translation> </message> @@ -427,38 +407,38 @@ <translation>Subsurface native XML format.</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="154"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="157"/> <source>Export UDDF file as</source> <translation>Export UDDF file as</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="158"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="161"/> <source>Export CSV file as</source> <translation>Export CSV file as</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="163"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="166"/> <source>Export world map</source> <translation>Export world map</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="164"/> - <location filename="../qt-ui/divelogexportdialog.cpp" line="178"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="167"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="181"/> <source>HTML files (*.html)</source> <translation>HTML files (*.html)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="168"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="171"/> <source>Export Subsurface XML</source> <translation>Export Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="169"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="172"/> <source>XML files (*.xml *.ssrf)</source> <translation>XML files (*.xml *.ssrf)</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.cpp" line="177"/> + <location filename="../qt-ui/divelogexportdialog.cpp" line="180"/> <source>Export HTML files as</source> <translation>Export HTML files as</translation> </message> @@ -640,7 +620,7 @@ <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="158"/> + <location filename="../qt-ui/diveplanner.ui" line="161"/> <source>m</source> <translation>m</translation> </message> @@ -653,37 +633,37 @@ <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="592"/> + <location filename="../qt-ui/diveplanner.cpp" line="622"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="594"/> + <location filename="../qt-ui/diveplanner.cpp" line="624"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="596"/> + <location filename="../qt-ui/diveplanner.cpp" line="626"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="598"/> + <location filename="../qt-ui/diveplanner.cpp" line="628"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="600"/> + <location filename="../qt-ui/diveplanner.cpp" line="630"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="893"/> + <location filename="../qt-ui/diveplanner.cpp" line="925"/> <source>Discard the plan?</source> <translation>Discard the plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="894"/> + <location filename="../qt-ui/diveplanner.cpp" line="926"/> <source>You are about to discard your plan.</source> <translation>You are about to discard your plan.</translation> </message> @@ -691,17 +671,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="252"/> + <location filename="../qt-ui/diveplanner.cpp" line="255"/> <source>Dive planner points</source> <translation>Dive planner points</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="256"/> + <location filename="../qt-ui/diveplanner.cpp" line="259"/> <source>Available gases</source> <translation>Available gases</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="279"/> + <location filename="../qt-ui/diveplanner.cpp" line="282"/> <source>Add dive data point</source> <translation>Add dive data point</translation> </message> @@ -782,67 +762,67 @@ <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1286"/> + <location filename="../qt-ui/models.cpp" line="1296"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1289"/> + <location filename="../qt-ui/models.cpp" line="1299"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1295"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1295"/> + <location filename="../qt-ui/models.cpp" line="1305"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1298"/> + <location filename="../qt-ui/models.cpp" line="1308"/> <source>Mins</source> <translation>Mins</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1307"/> + <location filename="../qt-ui/models.cpp" line="1317"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1310"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1322"/> + <location filename="../qt-ui/models.cpp" line="1332"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1325"/> + <location filename="../qt-ui/models.cpp" line="1335"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1304"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1304"/> + <location filename="../qt-ui/models.cpp" line="1314"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1316"/> + <location filename="../qt-ui/models.cpp" line="1326"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1319"/> + <location filename="../qt-ui/models.cpp" line="1329"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -850,26 +830,6 @@ <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> - <source>Invalid response from server</source> - <translation>Invalid response from server</translation> - </message> - <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> - <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> - </message> - <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> - <source>Expected XML tag 'DiveDates' not found</source> - <translation>Expected XML tag 'DiveDates' not found</translation> - </message> - <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> - <source>Malformed XML response. Line %1: %2</source> - <translation>Malformed XML response. Line %1: %2</translation> - </message> - <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="111"/> <source>no dives were selected</source> <translation>no dives were selected</translation> @@ -1090,7 +1050,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="440"/> + <location filename="../qt-ui/maintab.cpp" line="439"/> <source>Location</source> <translation>Location</translation> </message> @@ -1131,27 +1091,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="416"/> + <location filename="../qt-ui/maintab.cpp" line="415"/> <source>Dive notes</source> <translation>Dive notes</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="607"/> - <location filename="../qt-ui/maintab.cpp" line="245"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>Air temp.</source> <translation>Air temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="626"/> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <source>Water temp.</source> <translation>Water temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="441"/> + <location filename="../qt-ui/maintab.cpp" line="440"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -1176,11 +1136,6 @@ <translation>Max. depth</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="550"/> - <source>Ave. depth</source> - <translation>Ave. depth</translation> - </message> - <message> <location filename="../qt-ui/maintab.ui" line="588"/> <source>Air pressure</source> <translation>Air pressure</translation> @@ -1228,6 +1183,11 @@ <translation>SAC</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="550"/> + <source>Avg. depth</source> + <translation>Avg. depth</translation> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="569"/> <source>OTU</source> <translation>OTU</translation> @@ -1268,22 +1228,22 @@ <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="88"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="90"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Add Cylinder</source> <translation>Add Cylinder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="92"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="94"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Add Weight System</source> <translation>Add Weight System</translation> </message> @@ -1298,72 +1258,84 @@ <translation>Cancel</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="241"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="243"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="278"/> + <location filename="../qt-ui/maintab.cpp" line="277"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="285"/> + <location filename="../qt-ui/maintab.cpp" line="284"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="287"/> + <location filename="../qt-ui/maintab.cpp" line="286"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="387"/> - <location filename="../qt-ui/maintab.cpp" line="411"/> + <location filename="../qt-ui/maintab.cpp" line="386"/> + <location filename="../qt-ui/maintab.cpp" line="410"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="409"/> + <location filename="../qt-ui/maintab.cpp" line="408"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="462"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="461"/> + <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="502"/> <location filename="../qt-ui/maintab.cpp" line="503"/> <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="505"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="464"/> + <location filename="../qt-ui/maintab.cpp" line="463"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="500"/> <source>Deepest dive</source> <translation>Deepest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="502"/> + <location filename="../qt-ui/maintab.cpp" line="501"/> <source>Shallowest dive</source> <translation>Shallowest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="794"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <source>These gases could be +mixed from Air and using: +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="549"/> + <source> and </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.cpp" line="797"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="795"/> + <location filename="../qt-ui/maintab.cpp" line="798"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -1371,12 +1343,7 @@ <context> <name>MainWindow</name> <message> - <location filename="../qt-ui/mainwindow.ui" line="718"/> - <source>Filter</source> - <translation>Filter</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="669"/> + <location filename="../qt-ui/mainwindow.ui" line="672"/> <source>&File</source> <translation>&File</translation> </message> @@ -1436,27 +1403,22 @@ <translation>Toggle ruler</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="446"/> - <source>Toggle pO2 Graph</source> - <translation>Toggle pO2 Graph</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="475"/> - <source>Toggle pN2 Graph</source> - <translation>Toggle pN2 Graph</translation> + <location filename="../qt-ui/mainwindow.ui" line="501"/> + <source>Toggle viewing picture thumbnails</source> + <translation>Toggle viewing picture thumbnails</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="590"/> + <location filename="../qt-ui/mainwindow.ui" line="593"/> <source><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></source> <translation><html><head/><body><p><span style=" font-weight:600;">Dive plan details</span></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="606"/> + <location filename="../qt-ui/mainwindow.ui" line="609"/> <source>Print</source> <translation>Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="639"/> + <location filename="../qt-ui/mainwindow.ui" line="642"/> <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -1469,177 +1431,177 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'.Curier New';"><br /></p></body></html></translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="690"/> + <location filename="../qt-ui/mainwindow.ui" line="693"/> <source>&Log</source> <translation>&Log</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="702"/> + <location filename="../qt-ui/mainwindow.ui" line="705"/> <source>&View</source> <translation>&View</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="724"/> + <location filename="../qt-ui/mainwindow.ui" line="721"/> <source>&Help</source> <translation>&Help</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="732"/> + <location filename="../qt-ui/mainwindow.ui" line="729"/> <source>&Import</source> <translation>&Import</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="748"/> + <location filename="../qt-ui/mainwindow.ui" line="744"/> <source>&New logbook</source> <translation>&New logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="751"/> + <location filename="../qt-ui/mainwindow.ui" line="747"/> <source>New</source> <translation>New</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="754"/> + <location filename="../qt-ui/mainwindow.ui" line="750"/> <source>Ctrl+N</source> <translation>Ctrl+N</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="759"/> + <location filename="../qt-ui/mainwindow.ui" line="755"/> <source>&Open logbook</source> <translation>&Open logbook</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="762"/> + <location filename="../qt-ui/mainwindow.ui" line="758"/> <source>Open</source> <translation>Open</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="765"/> + <location filename="../qt-ui/mainwindow.ui" line="761"/> <source>Ctrl+O</source> <translation>Ctrl+O</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="770"/> + <location filename="../qt-ui/mainwindow.ui" line="766"/> <source>&Save</source> <translation>&Save</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="773"/> + <location filename="../qt-ui/mainwindow.ui" line="769"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="776"/> + <location filename="../qt-ui/mainwindow.ui" line="772"/> <source>Ctrl+S</source> <translation>Ctrl+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="781"/> + <location filename="../qt-ui/mainwindow.ui" line="777"/> <source>Sa&ve as</source> <translation>Sa&ve as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="784"/> + <location filename="../qt-ui/mainwindow.ui" line="780"/> <source>Save as</source> <translation>Save as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="787"/> + <location filename="../qt-ui/mainwindow.ui" line="783"/> <source>Ctrl+Shift+S</source> <translation>Ctrl+Shift+S</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="792"/> + <location filename="../qt-ui/mainwindow.ui" line="788"/> <source>&Close</source> <translation>&Close</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="795"/> + <location filename="../qt-ui/mainwindow.ui" line="791"/> <source>Close</source> <translation>Close</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="798"/> + <location filename="../qt-ui/mainwindow.ui" line="794"/> <source>Ctrl+W</source> <translation>Ctrl+W</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="811"/> + <location filename="../qt-ui/mainwindow.ui" line="807"/> <source>P&references</source> <translation>P&references</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="841"/> + <location filename="../qt-ui/mainwindow.ui" line="837"/> <source>Import &GPS data from Subsurface web service</source> <translation>Import &GPS data from Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="894"/> + <location filename="../qt-ui/mainwindow.ui" line="890"/> <source>&Profile</source> <translation>&Profile</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="902"/> + <location filename="../qt-ui/mainwindow.ui" line="898"/> <source>&Info</source> <translation>&Info</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="910"/> + <location filename="../qt-ui/mainwindow.ui" line="906"/> <source>&All</source> <translation>&All</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="926"/> + <location filename="../qt-ui/mainwindow.ui" line="922"/> <source>&Next DC</source> <translation>&Next DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="944"/> + <location filename="../qt-ui/mainwindow.ui" line="930"/> <source>&About Subsurface</source> <translation>&About Subsurface</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="960"/> + <location filename="../qt-ui/mainwindow.ui" line="946"/> <source>&Globe</source> <translation>&Globe</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="982"/> + <location filename="../qt-ui/mainwindow.ui" line="968"/> <source>Ctrl+I</source> <translation>Ctrl+I</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="987"/> + <location filename="../qt-ui/mainwindow.ui" line="973"/> <source>Import &from divelogs.de</source> <translation>Import &from divelogs.de</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="995"/> + <location filename="../qt-ui/mainwindow.ui" line="981"/> <source>&Full screen</source> <translation>&Full screen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="998"/> + <location filename="../qt-ui/mainwindow.ui" line="984"/> <source>Toggle full screen</source> <translation>Toggle full screen</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="1026"/> + <location filename="../qt-ui/mainwindow.ui" line="1012"/> <source>&Check for updates</source> <translation>&Check for updates</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="1031"/> + <location filename="../qt-ui/mainwindow.ui" line="1017"/> <source>&Export</source> <translation>&Export</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="1034"/> + <location filename="../qt-ui/mainwindow.ui" line="1020"/> <source>Export Dive Logs</source> <translation>Export Dive Logs</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="1037"/> + <location filename="../qt-ui/mainwindow.ui" line="1023"/> <source>Ctrl+E</source> <translation>Ctrl+E</translation> </message> @@ -1649,57 +1611,57 @@ p, li { white-space: pre-wrap; } <translation>Rescale depth axis</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="803"/> + <location filename="../qt-ui/mainwindow.ui" line="799"/> <source>&Print</source> <translation>&Print</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="814"/> + <location filename="../qt-ui/mainwindow.ui" line="810"/> <source>Ctrl+,</source> <translation>Ctrl+,</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="822"/> + <location filename="../qt-ui/mainwindow.ui" line="818"/> <source>&Quit</source> <translation>&Quit</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="833"/> + <location filename="../qt-ui/mainwindow.ui" line="829"/> <source>Import from &dive computer</source> <translation>Import from &dive computer</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="844"/> + <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>Ctrl+G</source> <translation>Ctrl+G</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="857"/> + <location filename="../qt-ui/mainwindow.ui" line="853"/> <source>Ctrl++</source> <translation>Ctrl++</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="862"/> + <location filename="../qt-ui/mainwindow.ui" line="858"/> <source>&Renumber</source> <translation>&Renumber</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="865"/> + <location filename="../qt-ui/mainwindow.ui" line="861"/> <source>Ctrl+R</source> <translation>Ctrl+R</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="881"/> + <location filename="../qt-ui/mainwindow.ui" line="877"/> <source>Ctrl+Y</source> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="971"/> + <location filename="../qt-ui/mainwindow.ui" line="957"/> <source>Ctrl+L</source> <translation>Ctrl+L</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="806"/> + <location filename="../qt-ui/mainwindow.ui" line="802"/> <source>Ctrl+P</source> <translation>Ctrl+P</translation> </message> @@ -1718,122 +1680,122 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/mainwindow.ui" line="423"/> <location filename="../qt-ui/mainwindow.ui" line="449"/> <location filename="../qt-ui/mainwindow.ui" line="478"/> - <location filename="../qt-ui/mainwindow.ui" line="501"/> + <location filename="../qt-ui/mainwindow.ui" line="504"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="825"/> + <location filename="../qt-ui/mainwindow.ui" line="446"/> + <source>Toggle pO₂ Graph</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="475"/> + <source>Toggle pN₂ Graph</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="821"/> <source>Ctrl+Q</source> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="836"/> + <location filename="../qt-ui/mainwindow.ui" line="832"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="849"/> + <location filename="../qt-ui/mainwindow.ui" line="845"/> <source>&Edit device names</source> <translation>&Edit device names</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="854"/> + <location filename="../qt-ui/mainwindow.ui" line="850"/> <source>&Add dive</source> <translation>&Add dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="873"/> + <location filename="../qt-ui/mainwindow.ui" line="869"/> <source>Auto &group</source> <translation>Auto &group</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="878"/> + <location filename="../qt-ui/mainwindow.ui" line="874"/> <source>&Yearly statistics</source> <translation>&Yearly statistics</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="886"/> + <location filename="../qt-ui/mainwindow.ui" line="882"/> <source>&Dive list</source> <translation>&Dive list</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="889"/> + <location filename="../qt-ui/mainwindow.ui" line="885"/> <source>Ctrl+2</source> <translation>Ctrl+2</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="897"/> + <location filename="../qt-ui/mainwindow.ui" line="893"/> <source>Ctrl+3</source> <translation>Ctrl+3</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="905"/> + <location filename="../qt-ui/mainwindow.ui" line="901"/> <source>Ctrl+4</source> <translation>Ctrl+4</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="913"/> + <location filename="../qt-ui/mainwindow.ui" line="909"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="918"/> + <location filename="../qt-ui/mainwindow.ui" line="914"/> <source>P&revious DC</source> <translation>P&revious DC</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="921"/> + <location filename="../qt-ui/mainwindow.ui" line="917"/> <source>Left</source> <translation>Left</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="929"/> + <location filename="../qt-ui/mainwindow.ui" line="925"/> <source>Right</source> <translation>Right</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="934"/> - <source>&Select events</source> - <translation>&Select events</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="939"/> - <source>Input Plan</source> - <translation>Input Plan</translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.ui" line="952"/> + <location filename="../qt-ui/mainwindow.ui" line="938"/> <source>User &manual</source> <translation>User &manual</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="955"/> + <location filename="../qt-ui/mainwindow.ui" line="941"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="963"/> + <location filename="../qt-ui/mainwindow.ui" line="949"/> <source>Ctrl+5</source> <translation>Ctrl+5</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="968"/> + <location filename="../qt-ui/mainwindow.ui" line="954"/> <source>P&lan dive</source> <translation>P&lan dive</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="976"/> + <location filename="../qt-ui/mainwindow.ui" line="962"/> <source>&Import log files</source> <translation>&Import log files</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="979"/> + <location filename="../qt-ui/mainwindow.ui" line="965"/> <source>Import divelog files from other applications</source> <translation>Import divelog files from other applications</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="1001"/> + <location filename="../qt-ui/mainwindow.ui" line="987"/> <source>F11</source> <translation>F11</translation> </message> @@ -1843,80 +1805,80 @@ p, li { white-space: pre-wrap; } <translation>Open file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="282"/> + <location filename="../qt-ui/mainwindow.cpp" line="283"/> <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="../qt-ui/mainwindow.cpp" line="389"/> + <location filename="../qt-ui/mainwindow.cpp" line="390"/> <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="../qt-ui/mainwindow.cpp" line="420"/> + <location filename="../qt-ui/mainwindow.cpp" line="421"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="515"/> + <location filename="../qt-ui/mainwindow.cpp" line="516"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="710"/> + <location filename="../qt-ui/mainwindow.cpp" line="701"/> <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="../qt-ui/mainwindow.cpp" line="712"/> + <location filename="../qt-ui/mainwindow.cpp" line="703"/> <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="../qt-ui/mainwindow.cpp" line="717"/> + <location filename="../qt-ui/mainwindow.cpp" line="708"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1076"/> + <location filename="../qt-ui/mainwindow.cpp" line="1066"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1200"/> + <location filename="../qt-ui/mainwindow.cpp" line="1190"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1201"/> + <location filename="../qt-ui/mainwindow.cpp" line="1191"/> <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</source> <translation>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="718"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <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="../qt-ui/mainwindow.cpp" line="250"/> - <location filename="../qt-ui/mainwindow.cpp" line="389"/> - <location filename="../qt-ui/mainwindow.cpp" line="1226"/> + <location filename="../qt-ui/mainwindow.cpp" line="251"/> + <location filename="../qt-ui/mainwindow.cpp" line="390"/> + <location filename="../qt-ui/mainwindow.cpp" line="1216"/> <source>Warning</source> <translation>Warning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1060"/> + <location filename="../qt-ui/mainwindow.cpp" line="1050"/> <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="../qt-ui/mainwindow.cpp" line="1077"/> + <location filename="../qt-ui/mainwindow.cpp" line="1067"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1226"/> + <location filename="../qt-ui/mainwindow.cpp" line="1216"/> <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> @@ -1924,12 +1886,12 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="415"/> + <location filename="../qt-ui/diveplanner.cpp" line="444"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="422"/> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> @@ -2456,72 +2418,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1878"/> + <location filename="../qt-ui/models.cpp" line="1901"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1883"/> + <location filename="../qt-ui/models.cpp" line="1906"/> <source>Dive #%1 - %2</source> <translation>Dive No. %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1886"/> + <location filename="../qt-ui/models.cpp" line="1909"/> <source>Max depth: %1 %2</source> <translation>Max depth: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1893"/> + <location filename="../qt-ui/models.cpp" line="1916"/> <source>Duration: %1 min</source> <translation>Duration: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1898"/> + <location filename="../qt-ui/models.cpp" line="1921"/> <source>Gas used:</source> <translation>Gas used:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1900"/> - <source>SAC:</source> - <translation>SAC:</translation> + <location filename="../qt-ui/models.cpp" line="1923"/> + <source>Tags:</source> + <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1902"/> - <source>Max. CNS:</source> - <translation>Max. CNS:</translation> + <location filename="../qt-ui/models.cpp" line="1925"/> + <source>SAC:</source> + <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1904"/> + <location filename="../qt-ui/models.cpp" line="1927"/> <source>Weights:</source> <translation>Weights:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1909"/> + <location filename="../qt-ui/models.cpp" line="1932"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1916"/> + <location filename="../qt-ui/models.cpp" line="1939"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1918"/> + <location filename="../qt-ui/models.cpp" line="1941"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1920"/> + <location filename="../qt-ui/models.cpp" line="1943"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1922"/> + <location filename="../qt-ui/models.cpp" line="1945"/> <source>Viz:</source> <translation>Viz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1924"/> + <location filename="../qt-ui/models.cpp" line="1947"/> <source>Rating:</source> <translation>Rating:</translation> </message> @@ -2612,7 +2574,7 @@ p, li { white-space: pre-wrap; } <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="210"/> + <location filename="../qt-ui/diveplanner.cpp" line="212"/> <source>Remove this point</source> <translation>Remove this point</translation> </message> @@ -2641,6 +2603,66 @@ p, li { white-space: pre-wrap; } <source>Move the map and double-click to set the dive location</source> <translation>Move the map and double-click to set the dive location</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="472"/> + <source>kg</source> + <translation>kg</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="473"/> + <source>lbs</source> + <translation>lbs</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="497"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="498"/> + <source>m</source> + <translation>m</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="521"/> + <source>psi</source> + <translation>psi</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="522"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="546"/> + <source>l</source> + <translation>l</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="547"/> + <source>cuft</source> + <translation>cuft</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <source>Invalid response from server</source> + <translation>Invalid response from server</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <source>Expected XML tag 'DiveDateReader', got instead '%1</source> + <translation>Expected XML tag 'DiveDateReader', got instead '%1</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="574"/> + <source>Expected XML tag 'DiveDates' not found</source> + <translation>Expected XML tag 'DiveDates' not found</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="581"/> + <source>Malformed XML response. Line %1: %2</source> + <translation>Malformed XML response. Line %1: %2</translation> + </message> </context> <context> <name>RenumberDialog</name> @@ -2853,17 +2875,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="850"/> + <location filename="../qt-ui/models.cpp" line="863"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="850"/> + <location filename="../qt-ui/models.cpp" line="863"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="850"/> + <location filename="../qt-ui/models.cpp" line="863"/> <source>bar</source> <translation>bar</translation> </message> @@ -2936,7 +2958,7 @@ p, li { white-space: pre-wrap; } <context> <name>UserSurvey</name> <message> - <location filename="../qt-ui/usersurvey.ui" line="60"/> + <location filename="../qt-ui/usersurvey.ui" line="32"/> <source>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</source> <translation>We would love to learn more about our users, their preferences and their usage habits. Please take a minute to fill out this form and submit it to the Subsurface team. Please select all options that apply to you.</translation> </message> @@ -2946,130 +2968,130 @@ p, li { white-space: pre-wrap; } <translation>User Survey</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="47"/> + <location filename="../qt-ui/usersurvey.ui" line="25"/> <source>Subsurface user survey</source> <translation>Subsurface user survey</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="79"/> + <location filename="../qt-ui/usersurvey.ui" line="52"/> <source>Recreational diver</source> <translation>Recreational diver</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="92"/> + <location filename="../qt-ui/usersurvey.ui" line="45"/> <source>Technical diver</source> <translation>Technical diver</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="105"/> + <location filename="../qt-ui/usersurvey.ui" line="59"/> <source>Interested in dive planning</source> <translation>Interested in dive planning</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="118"/> + <location filename="../qt-ui/usersurvey.ui" line="66"/> <source>I am downloading dives from supported dive computer</source> <translation>I am downloading dives from supported dive computer</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="131"/> + <location filename="../qt-ui/usersurvey.ui" line="73"/> <source>I am importing dives from other software / sources</source> <translation>I am importing dives from other software / sources</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="144"/> + <location filename="../qt-ui/usersurvey.ui" line="80"/> <source>I am manually entering dives</source> <translation>I am manually entering dives</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="167"/> + <location filename="../qt-ui/usersurvey.ui" line="87"/> <source>I use the Android companion app to track dive locations</source> <translation>I use the Android companion app to track dive locations</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="190"/> + <location filename="../qt-ui/usersurvey.ui" line="94"/> <source>Please type suggestions (in English) in the following box</source> <translation>Please type suggestions (in English) in the following box</translation> </message> <message> - <location filename="../qt-ui/usersurvey.ui" line="203"/> + <location filename="../qt-ui/usersurvey.ui" line="104"/> <source>The following information about your system will also be submitted</source> <translation>The following information about your system will also be submitted</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="27"/> + <location filename="../qt-ui/usersurvey.cpp" line="28"/> <source> Operating System: %1</source> <translation> Operating System: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="30"/> + <location filename="../qt-ui/usersurvey.cpp" line="31"/> <source> CPU Architecture: %1</source> <translation> CPU Architecture: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="35"/> - <source> -OS CPU Architecture %1</source> - <translation> -OS CPU Architecture %1</translation> - </message> - <message> - <location filename="../qt-ui/usersurvey.cpp" line="39"/> + <location filename="../qt-ui/usersurvey.cpp" line="40"/> <source> Language: %1</source> <translation> Language: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="73"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Should we ask you later?</source> <translation>Should we ask you later?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Don't ask me again</source> <translation>Don't ask me again</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="76"/> <source>Ask later</source> <translation>Ask later</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="95"/> + <location filename="../qt-ui/usersurvey.cpp" line="96"/> <source>Submit user survey.</source> <translation>Submit user survey.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="77"/> <source>Ask again?</source> <translation>Ask again?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="36"/> + <source> +OS CPU Architecture: %1</source> + <translation> +OS CPU Architecture: %1</translation> + </message> + <message> + <location filename="../qt-ui/usersurvey.cpp" line="97"/> <source>Subsurface was unable to submit the user survey.</source> <translation>Subsurface was unable to submit the user survey.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="101"/> + <location filename="../qt-ui/usersurvey.cpp" line="102"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="103"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="111"/> + <location filename="../qt-ui/usersurvey.cpp" line="112"/> <source>Survey successfully submitted.</source> <translation>Survey successfully submitted.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="116"/> + <location filename="../qt-ui/usersurvey.cpp" line="117"/> <source>There was an error while trying to check for updates.<br/><br/>%1</source> <translation>There was an error while trying to check for updates.<br/><br/>%1</translation> </message> @@ -3077,12 +3099,12 @@ Language: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="721"/> + <location filename="../qt-ui/models.cpp" line="734"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="721"/> + <location filename="../qt-ui/models.cpp" line="734"/> <source>kg</source> <translation>kg</translation> </message> @@ -3143,117 +3165,97 @@ Language: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="387"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="387"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="433"/> + <location filename="../qt-ui/models.cpp" line="447"/> <source>Clicking here will remove this weight system.</source> <translation>Clicking here will remove this weight system.</translation> </message> - <message> - <location filename="../qt-ui/models.cpp" line="458"/> - <source>kg</source> - <translation>kg</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="459"/> - <source>lbs</source> - <translation>lbs</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="483"/> - <source>ft</source> - <translation>ft</translation> - </message> - <message> - <location filename="../qt-ui/models.cpp" line="484"/> - <source>m</source> - <translation>m</translation> - </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1637"/> + <location filename="../qt-ui/models.cpp" line="1647"/> <source>Year > Month / Trip</source> <translation>Year > Month / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1640"/> + <location filename="../qt-ui/models.cpp" line="1650"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1653"/> <source>Duration Total</source> <translation>Duration Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1646"/> + <location filename="../qt-ui/models.cpp" line="1656"/> <source> Average</source> <translation> Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1649"/> + <location filename="../qt-ui/models.cpp" line="1659"/> <source> Shortest</source> <translation> Shortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1652"/> + <location filename="../qt-ui/models.cpp" line="1662"/> <source> Longest</source> <translation> Longest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1655"/> + <location filename="../qt-ui/models.cpp" line="1665"/> <source>Depth (%1) Average</source> <translation>Depth (%1) Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1658"/> - <location filename="../qt-ui/models.cpp" line="1667"/> - <location filename="../qt-ui/models.cpp" line="1676"/> + <location filename="../qt-ui/models.cpp" line="1668"/> + <location filename="../qt-ui/models.cpp" line="1677"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> - <location filename="../qt-ui/models.cpp" line="1670"/> - <location filename="../qt-ui/models.cpp" line="1679"/> + <location filename="../qt-ui/models.cpp" line="1671"/> + <location filename="../qt-ui/models.cpp" line="1680"/> + <location filename="../qt-ui/models.cpp" line="1689"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1664"/> + <location filename="../qt-ui/models.cpp" line="1674"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1673"/> + <location filename="../qt-ui/models.cpp" line="1683"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -3263,29 +3265,29 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="87"/> + <location filename="../dive.c" line="123"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="92"/> + <location filename="../dive.c" line="128"/> <location filename="../qt-gui.cpp" line="323"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="96"/> + <location filename="../dive.c" line="132"/> <location filename="../qt-gui.cpp" line="326"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="138"/> + <location filename="../dive.c" line="174"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="203"/> <location filename="../qt-gui.cpp" line="205"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../worldmap-save.c" line="44"/> @@ -3293,36 +3295,56 @@ Maximum</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="208"/> <location filename="../qt-gui.cpp" line="208"/> <location filename="../qt-gui.cpp" line="222"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="217"/> + <location filename="../dive.c" line="231"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../dive.c" line="233"/> + <source>m/s</source> + <translation>m/s</translation> + </message> + <message> + <location filename="../dive.c" line="238"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../dive.c" line="240"/> + <source>ft/s</source> + <translation>ft/s</translation> + </message> + <message> + <location filename="../dive.c" line="259"/> <location filename="../qt-gui.cpp" line="231"/> <location filename="../qt-gui.cpp" line="241"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="221"/> + <location filename="../dive.c" line="263"/> <location filename="../qt-gui.cpp" line="229"/> <location filename="../qt-gui.cpp" line="239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1237"/> + <location filename="../dive.c" line="1279"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> <location filename="../divelist.c" line="467"/> <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="977"/> - <location filename="../planner.c" line="980"/> + <location filename="../planner.c" line="986"/> + <location filename="../planner.c" line="989"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>air</translation> @@ -3592,26 +3614,26 @@ Maximum</translation> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="466"/> + <location filename="../parse-xml.c" line="467"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1685"/> + <location filename="../parse-xml.c" line="1692"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1906"/> + <location filename="../parse-xml.c" line="1913"/> <source>Database query get_events failed. </source> <translation>Database query get_events failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="1913"/> + <location filename="../parse-xml.c" line="1920"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags failed. @@ -3625,36 +3647,36 @@ Maximum</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1947"/> - <location filename="../parse-xml.c" line="2094"/> + <location filename="../parse-xml.c" line="1954"/> + <location filename="../parse-xml.c" line="2101"/> <source>Database query failed '%s'. </source> <translation>Database query failed '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2058"/> + <location filename="../parse-xml.c" line="2065"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2065"/> + <location filename="../parse-xml.c" line="2072"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2072"/> + <location filename="../parse-xml.c" line="2079"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2163"/> + <location filename="../parse-xml.c" line="2170"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -3665,7 +3687,7 @@ Maximum</translation> </message> <message> <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="752"/> + <location filename="../planner.c" line="761"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> @@ -3736,44 +3758,54 @@ Maximum</translation> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../planner.c" line="638"/> + <location filename="../planner.c" line="642"/> + <source>CNS</source> + <translation>CNS</translation> + </message> + <message> + <location filename="../planner.c" line="644"/> + <source>OTU</source> + <translation>OTU</translation> + </message> + <message> + <location filename="../planner.c" line="647"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> - <location filename="../planner.c" line="658"/> - <location filename="../planner.c" line="663"/> - <location filename="../planner.c" line="686"/> + <location filename="../planner.c" line="667"/> + <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="695"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../planner.c" line="659"/> + <location filename="../planner.c" line="668"/> <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="../planner.c" line="664"/> + <location filename="../planner.c" line="673"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../planner.c" line="666"/> + <location filename="../planner.c" line="675"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="677"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s during planned ascent) of %s</translation> </message> <message> - <location filename="../planner.c" line="683"/> + <location filename="../planner.c" line="692"/> <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="../planner.c" line="981"/> + <location filename="../planner.c" line="990"/> <source>ean</source> <translation>ean</translation> </message> @@ -4123,7 +4155,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="133"/> + <location filename="../dive.c" line="169"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -4478,7 +4510,7 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Low Battery Alert</translation> </message> <message> - <location filename="../save-html.c" line="272"/> + <location filename="../save-html.c" line="293"/> <location filename="../worldmap-save.c" line="106"/> <source>Can't open file %s</source> <translation>Can't open file %s</translation> @@ -4528,6 +4560,30 @@ Is the Uemis Zurich plugged in correctly?</translation> <source>Notes:</source> <translation>Notes:</translation> </message> + <message> + <location filename="../qthelper.cpp" line="46"/> + <location filename="../qthelper.cpp" line="73"/> + <source>N</source> + <translation>N</translation> + </message> + <message> + <location filename="../qthelper.cpp" line="46"/> + <location filename="../qthelper.cpp" line="74"/> + <source>S</source> + <translation>S</translation> + </message> + <message> + <location filename="../qthelper.cpp" line="47"/> + <location filename="../qthelper.cpp" line="75"/> + <source>E</source> + <translation>E</translation> + </message> + <message> + <location filename="../qthelper.cpp" line="47"/> + <location filename="../qthelper.cpp" line="76"/> + <source>W</source> + <translation>W</translation> + </message> </context> <context> <name>plannerSettingsWidget</name> |