diff options
Diffstat (limited to 'translations/subsurface_en_GB.ts')
| -rw-r--r-- | translations/subsurface_en_GB.ts | 721 |
1 files changed, 370 insertions, 351 deletions
diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 62f3bb4bb..a156e3ba9 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -104,18 +104,18 @@ <context> <name>DiveEventItem</name> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="101"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="107"/> <source>Bailing out to OC</source> <translation>Bailing out to OC</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="103"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="109"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../qt-ui/profile/diveeventitem.cpp" line="104"/> + <location filename="../qt-ui/profile/diveeventitem.cpp" line="110"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -137,87 +137,87 @@ <translation>Show search box</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="705"/> + <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="706"/> + <location filename="../qt-ui/divelistview.cpp" line="708"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="707"/> + <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="709"/> + <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="710"/> + <location filename="../qt-ui/divelistview.cpp" line="712"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="724"/> + <location filename="../qt-ui/divelistview.cpp" line="726"/> <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="726"/> + <location filename="../qt-ui/divelistview.cpp" line="728"/> <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="730"/> + <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="731"/> + <location filename="../qt-ui/divelistview.cpp" line="733"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="735"/> + <location filename="../qt-ui/divelistview.cpp" line="737"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="737"/> + <location filename="../qt-ui/divelistview.cpp" line="739"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="741"/> + <location filename="../qt-ui/divelistview.cpp" line="743"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="745"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="746"/> <source>Shift times</source> <translation>Shift times</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="747"/> <source>Load images</source> <translation>Load images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Open image files</source> <translation>Open image files</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="766"/> + <location filename="../qt-ui/divelistview.cpp" line="768"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -225,59 +225,59 @@ <context> <name>DiveLogExportDialog</name> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="30"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="35"/> <source>Export format</source> <translation>Export format</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="42"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="47"/> <source>Subsurface XML</source> <translation>Subsurface XML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="61"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="66"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="74"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="79"/> <source>divelogs.de</source> <translation>divelogs.de</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="84"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="89"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="94"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="99"/> <source>Worldmap</source> <translation>Worldmap</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="107"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="112"/> <source>Selection</source> <translation>Selection</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="116"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="203"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="121"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="208"/> <source>Selected dives</source> <translation>Selected dives</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="126"/> - <location filename="../qt-ui/divelogexportdialog.ui" line="229"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="131"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="234"/> <source>All dives</source> <translation>All dives</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="178"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="183"/> <source>HTML</source> <translation>HTML</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="216"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="221"/> <source>Minimum Javascript</source> <translation>Minimum Javascript</translation> </message> @@ -287,87 +287,87 @@ <translation>Export dive log files</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="24"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="29"/> <source>General export</source> <translation>General export</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="184"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>General settings</source> <translation>General settings</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="190"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="195"/> <source>Subsurface numbers</source> <translation>Subsurface numbers</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="239"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export list only</source> <translation>Export list only</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="252"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="257"/> <source>Style options</source> <translation>Style options</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="264"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="269"/> <source>Font</source> <translation>Font</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="274"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="279"/> <source>Font size</source> <translation>Font size</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="285"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> <source>8</source> <translation>8</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="290"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> <source>10</source> <translation>10</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="295"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> <source>12</source> <translation>12</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="300"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> <source>14</source> <translation>14</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="305"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> <source>16</source> <translation>16</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="310"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> <source>18</source> <translation>18</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="315"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="320"/> <source>20</source> <translation>20</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="323"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="328"/> <source>Theme</source> <translation>Theme</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="334"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> <source>Light</source> <translation>Light</translation> </message> <message> - <location filename="../qt-ui/divelogexportdialog.ui" line="339"/> + <location filename="../qt-ui/divelogexportdialog.ui" line="344"/> <source>Sand</source> <translation>Sand</translation> </message> @@ -628,42 +628,42 @@ <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="137"/> + <location filename="../qt-ui/diveplanner.cpp" line="135"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="622"/> + <location filename="../qt-ui/diveplanner.cpp" line="634"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="624"/> + <location filename="../qt-ui/diveplanner.cpp" line="636"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="626"/> + <location filename="../qt-ui/diveplanner.cpp" line="638"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="628"/> + <location filename="../qt-ui/diveplanner.cpp" line="640"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="630"/> + <location filename="../qt-ui/diveplanner.cpp" line="642"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="925"/> + <location filename="../qt-ui/diveplanner.cpp" line="938"/> <source>Discard the plan?</source> <translation>Discard the plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="926"/> + <location filename="../qt-ui/diveplanner.cpp" line="939"/> <source>You are about to discard your plan.</source> <translation>You are about to discard your plan.</translation> </message> @@ -671,17 +671,17 @@ <context> <name>DivePlannerWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="255"/> + <location filename="../qt-ui/diveplanner.cpp" line="254"/> <source>Dive planner points</source> <translation>Dive planner points</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="259"/> + <location filename="../qt-ui/diveplanner.cpp" line="258"/> <source>Available gases</source> <translation>Available gases</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="282"/> + <location filename="../qt-ui/diveplanner.cpp" line="281"/> <source>Add dive data point</source> <translation>Add dive data point</translation> </message> @@ -855,70 +855,70 @@ <translation>internal error</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="636"/> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="832"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="637"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="667"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="668"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="698"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="699"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="747"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="789"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="790"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="807"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="808"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="846"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="847"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="849"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="850"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="852"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="853"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="855"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="856"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="866"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="867"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="833"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="834"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> @@ -1050,7 +1050,7 @@ <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="450"/> <source>Location</source> <translation>Location</translation> </message> @@ -1091,27 +1091,27 @@ </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="415"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <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="244"/> + <location filename="../qt-ui/maintab.cpp" line="245"/> <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="245"/> + <location filename="../qt-ui/maintab.cpp" line="246"/> <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="440"/> + <location filename="../qt-ui/maintab.cpp" line="451"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -1228,114 +1228,116 @@ <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="88"/> + <location filename="../qt-ui/maintab.cpp" line="89"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="89"/> + <location filename="../qt-ui/maintab.cpp" line="90"/> <source>Add Cylinder</source> <translation>Add Cylinder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="93"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="93"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Add Weight System</source> <translation>Add Weight System</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="48"/> + <location filename="../qt-ui/maintab.cpp" line="49"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="52"/> + <location filename="../qt-ui/maintab.cpp" line="53"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="241"/> + <location filename="../qt-ui/maintab.cpp" line="242"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="242"/> + <location filename="../qt-ui/maintab.cpp" line="243"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="277"/> + <location filename="../qt-ui/maintab.cpp" line="278"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="284"/> + <location filename="../qt-ui/maintab.cpp" line="285"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="286"/> + <location filename="../qt-ui/maintab.cpp" line="287"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="386"/> - <location filename="../qt-ui/maintab.cpp" line="410"/> + <location filename="../qt-ui/maintab.cpp" line="397"/> + <location filename="../qt-ui/maintab.cpp" line="421"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="408"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <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="472"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> + <location filename="../qt-ui/maintab.cpp" line="513"/> + <location filename="../qt-ui/maintab.cpp" line="514"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="463"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="500"/> + <location filename="../qt-ui/maintab.cpp" line="511"/> <source>Deepest dive</source> <translation>Deepest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="501"/> + <location filename="../qt-ui/maintab.cpp" line="512"/> <source>Shallowest dive</source> <translation>Shallowest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="556"/> <source>These gases could be mixed from Air and using: </source> - <translation type="unfinished"/> + <translation>These gases could be +mixed from Air and using: +</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="549"/> + <location filename="../qt-ui/maintab.cpp" line="560"/> <source> and </source> - <translation type="unfinished"/> + <translation> and </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="797"/> + <location filename="../qt-ui/maintab.cpp" line="808"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="798"/> + <location filename="../qt-ui/maintab.cpp" line="809"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -1687,12 +1689,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="446"/> <source>Toggle pO₂ Graph</source> - <translation type="unfinished"/> + <translation>Toggle pO₂ Graph</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="475"/> <source>Toggle pN₂ Graph</source> - <translation type="unfinished"/> + <translation>Toggle pN₂ Graph</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="821"/> @@ -1815,70 +1817,70 @@ p, li { white-space: pre-wrap; } <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="421"/> + <location filename="../qt-ui/mainwindow.cpp" line="422"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="516"/> + <location filename="../qt-ui/mainwindow.cpp" line="522"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="701"/> + <location filename="../qt-ui/mainwindow.cpp" line="707"/> <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="703"/> + <location filename="../qt-ui/mainwindow.cpp" line="709"/> <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="708"/> + <location filename="../qt-ui/mainwindow.cpp" line="714"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1066"/> + <location filename="../qt-ui/mainwindow.cpp" line="1072"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1190"/> + <location filename="../qt-ui/mainwindow.cpp" line="1196"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1191"/> + <location filename="../qt-ui/mainwindow.cpp" line="1197"/> <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="709"/> + <location filename="../qt-ui/mainwindow.cpp" line="715"/> <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="251"/> <location filename="../qt-ui/mainwindow.cpp" line="390"/> - <location filename="../qt-ui/mainwindow.cpp" line="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <source>Warning</source> <translation>Warning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="188"/> - <location filename="../qt-ui/mainwindow.cpp" line="1050"/> + <location filename="../qt-ui/mainwindow.cpp" line="1056"/> <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="1067"/> + <location filename="../qt-ui/mainwindow.cpp" line="1073"/> <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="1216"/> + <location filename="../qt-ui/mainwindow.cpp" line="1222"/> <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> @@ -1886,15 +1888,45 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="444"/> + <location filename="../qt-ui/diveplanner.cpp" line="450"/> + <source>ft/min</source> + <translation>ft/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="451"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="451"/> + <location filename="../qt-ui/diveplanner.cpp" line="452"/> + <source>50% avg. depth to 20ft</source> + <translation>50% avg. depth to 20ft</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="453"/> + <source>20ft to surface</source> + <translation>20ft to surface</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="455"/> + <source>m/min</source> + <translation>m/min</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="456"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="457"/> + <source>50% avg. depth to 6m</source> + <translation>50% avg. depth to 6m</translation> + </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="458"/> + <source>6m to surface</source> + <translation>6m to surface</translation> + </message> </context> <context> <name>PreferencesDialog</name> @@ -1940,146 +1972,151 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/preferences.ui" line="198"/> + <source>Use default</source> + <translation>Use default</translation> + </message> + <message> + <location filename="../qt-ui/preferences.ui" line="208"/> <source>...</source> <translation>...</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="247"/> + <location filename="../qt-ui/preferences.ui" line="257"/> <source>Animations</source> <translation>Animations</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="253"/> + <location filename="../qt-ui/preferences.ui" line="263"/> <source>Speed</source> <translation>Speed</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="306"/> + <location filename="../qt-ui/preferences.ui" line="316"/> <source>Clear all settings</source> <translation>Clear all settings</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="312"/> + <location filename="../qt-ui/preferences.ui" line="322"/> <source>Reset all settings to their default value</source> <translation>Reset all settings to their default value</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="341"/> + <location filename="../qt-ui/preferences.ui" line="351"/> <source>System</source> <translation>System</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="348"/> + <location filename="../qt-ui/preferences.ui" line="358"/> <source>Metric</source> <translation>Metric</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="358"/> + <location filename="../qt-ui/preferences.ui" line="368"/> <source>Imperial</source> <translation>Imperial</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="368"/> + <location filename="../qt-ui/preferences.ui" line="378"/> <source>Personalize</source> <translation>Personalize</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="392"/> + <location filename="../qt-ui/preferences.ui" line="402"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="399"/> + <location filename="../qt-ui/preferences.ui" line="409"/> <source>meter</source> <translation>metre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="409"/> + <location filename="../qt-ui/preferences.ui" line="419"/> <source>feet</source> <translation>feet</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="426"/> + <location filename="../qt-ui/preferences.ui" line="436"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="436"/> + <location filename="../qt-ui/preferences.ui" line="446"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="453"/> + <location filename="../qt-ui/preferences.ui" line="463"/> <source>liter</source> <translation>litre</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="463"/> + <location filename="../qt-ui/preferences.ui" line="473"/> <source>cu ft</source> <translation>cu ft</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="480"/> + <location filename="../qt-ui/preferences.ui" line="490"/> <source>celsius</source> <translation>celsius</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="490"/> + <location filename="../qt-ui/preferences.ui" line="500"/> <source>fahrenheit</source> <translation>fahrenheit</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="507"/> + <location filename="../qt-ui/preferences.ui" line="517"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="772"/> + <location filename="../qt-ui/preferences.ui" line="782"/> <source>System default</source> <translation>System default</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="811"/> + <location filename="../qt-ui/preferences.ui" line="821"/> <source>Proxy</source> <translation>Proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="817"/> + <location filename="../qt-ui/preferences.ui" line="827"/> <source>Proxy type</source> <translation>Proxy type</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="830"/> + <location filename="../qt-ui/preferences.ui" line="840"/> <source>Host</source> <translation>Hostname</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="856"/> + <location filename="../qt-ui/preferences.ui" line="866"/> <source>Port</source> <translation>Port</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="882"/> + <location filename="../qt-ui/preferences.ui" line="892"/> <source>Requires authentication</source> <translation>Requires authentication</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="902"/> + <location filename="../qt-ui/preferences.ui" line="912"/> <source>Username</source> <translation>Username</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="925"/> + <location filename="../qt-ui/preferences.ui" line="935"/> <source>Password</source> <translation>Password</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="792"/> + <location filename="../qt-ui/preferences.ui" line="802"/> <source>Filter</source> <translation>Filter</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="419"/> + <location filename="../qt-ui/preferences.ui" line="429"/> <source>Pressure</source> <translation>Pressure</translation> </message> @@ -2094,82 +2131,82 @@ p, li { white-space: pre-wrap; } <translation>Default dive log file</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="207"/> + <location filename="../qt-ui/preferences.ui" line="217"/> <source>Display invalid</source> <translation>Display invalid</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="224"/> + <location filename="../qt-ui/preferences.ui" line="234"/> <source>Default cylinder</source> <translation>Default cylinder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="230"/> + <location filename="../qt-ui/preferences.ui" line="240"/> <source>Use default cylinder</source> <translation>Use default cylinder</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="280"/> + <location filename="../qt-ui/preferences.ui" line="290"/> <source>Subsurface web service</source> <translation>Subsurface web service</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="286"/> + <location filename="../qt-ui/preferences.ui" line="296"/> <source>Default user ID</source> <translation>Default user ID</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="296"/> + <location filename="../qt-ui/preferences.ui" line="306"/> <source>Save user ID locally?</source> <translation>Save user ID locally?</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="446"/> + <location filename="../qt-ui/preferences.ui" line="456"/> <source>Volume</source> <translation>Volume</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="473"/> + <location filename="../qt-ui/preferences.ui" line="483"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="500"/> + <location filename="../qt-ui/preferences.ui" line="510"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="517"/> + <location filename="../qt-ui/preferences.ui" line="527"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="532"/> + <location filename="../qt-ui/preferences.ui" line="542"/> <source>Time units</source> <translation>Time units</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="545"/> + <location filename="../qt-ui/preferences.ui" line="555"/> <source>Minutes</source> <translation>Minutes</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="555"/> + <location filename="../qt-ui/preferences.ui" line="565"/> <source>Seconds</source> <translation>Seconds</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="587"/> + <location filename="../qt-ui/preferences.ui" line="597"/> <source>Show</source> <translation>Show</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="756"/> + <location filename="../qt-ui/preferences.ui" line="766"/> <source>GFLow at max depth</source> <translation>GFLow at max depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="716"/> + <location filename="../qt-ui/preferences.ui" line="726"/> <source>Misc</source> <translation>Misc</translation> </message> @@ -2179,52 +2216,52 @@ p, li { white-space: pre-wrap; } <translation>Preferences</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="538"/> + <location filename="../qt-ui/preferences.ui" line="548"/> <source>Ascent/descent speed denominator</source> <translation>Ascent/descent speed denominator</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="598"/> + <location filename="../qt-ui/preferences.ui" line="608"/> <source>Threshold when showing pO₂</source> <translation>Threshold when showing pO₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="619"/> + <location filename="../qt-ui/preferences.ui" line="629"/> <source>Threshold when showing pN₂</source> <translation>Threshold when showing pN₂</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="640"/> + <location filename="../qt-ui/preferences.ui" line="650"/> <source>Threshold when showing pHe</source> <translation>Threshold when showing pHe</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="661"/> + <location filename="../qt-ui/preferences.ui" line="671"/> <source>Max pO₂ when showing MOD</source> <translation>Max pO₂ when showing MOD</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="682"/> + <location filename="../qt-ui/preferences.ui" line="692"/> <source>Draw dive computer reported ceiling red</source> <translation>Draw dive computer reported ceiling red</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="693"/> + <location filename="../qt-ui/preferences.ui" line="703"/> <source>Show unused cylinders in Equipment tab</source> <translation>Show unused cylinders in Equipment tab</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="704"/> + <location filename="../qt-ui/preferences.ui" line="714"/> <source>Show average depth</source> <translation>Show average depth</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="722"/> + <location filename="../qt-ui/preferences.ui" line="732"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../qt-ui/preferences.ui" line="739"/> + <location filename="../qt-ui/preferences.ui" line="749"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> @@ -2249,32 +2286,32 @@ p, li { white-space: pre-wrap; } <translation>SOCKS proxy</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="245"/> + <location filename="../qt-ui/preferences.cpp" line="247"/> <source>Restart required</source> <translation>Restart required</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="246"/> + <location filename="../qt-ui/preferences.cpp" line="248"/> <source>To correctly load a new language you must restart Subsurface.</source> <translation>To correctly load a new language you must restart Subsurface.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="395"/> + <location filename="../qt-ui/preferences.cpp" line="398"/> <source>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</source> <translation>If you click OK, all settings of Subsurface will be reset to their default values. This will be applied immediately.</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="381"/> + <location filename="../qt-ui/preferences.cpp" line="384"/> <source>Open default log file</source> <translation>Open default log file</translation> </message> <message> - <location filename="../qt-ui/preferences.cpp" line="394"/> + <location filename="../qt-ui/preferences.cpp" line="397"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -2369,51 +2406,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/printoptions.ui" line="145"/> + <source>1 dive per page</source> + <translation>1 dive per page</translation> + </message> + <message> + <location filename="../qt-ui/printoptions.ui" line="158"/> <source>Table print</source> <translation>Table print</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="162"/> + <location filename="../qt-ui/printoptions.ui" line="175"/> <source>Ordering</source> <translation>Ordering</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="180"/> + <location filename="../qt-ui/printoptions.ui" line="193"/> <source>Profile on top</source> <translation>Profile on top</translation> </message> <message> - <location filename="../qt-ui/printoptions.ui" line="202"/> + <location filename="../qt-ui/printoptions.ui" line="215"/> <source>Notes on top</source> <translation>Notes on top</translation> </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="219"/> - <source>Sizing heights (% of layout)</source> - <translation>Sizing heights (% of layout)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="256"/> - <source>Profile height (43% - 85%)</source> - <translation>Profile height (43% - 85%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="278"/> - <source>Other data height (8% - 17%)</source> - <translation>Other data height (8% - 17%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="338"/> - <source>Notes height (0% - 52%)</source> - <translation>Notes height (0% - 52%)</translation> - </message> - <message> - <location filename="../qt-ui/printoptions.ui" line="354"/> - <location filename="../qt-ui/printoptions.ui" line="370"/> - <location filename="../qt-ui/printoptions.ui" line="386"/> - <source>0</source> - <translation>0</translation> - </message> </context> <context> <name>ProfilePrintModel</name> @@ -2491,77 +2506,77 @@ p, li { white-space: pre-wrap; } <context> <name>ProfileWidget2</name> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="520"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="515"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="898"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="895"/> <source>Make first divecomputer</source> <translation>Make first dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="900"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="897"/> <source>Delete this divecomputer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="907"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="904"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="918"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="915"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="922"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="919"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="927"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="924"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="933"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="930"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="947"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="944"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="981"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="978"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1016"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1013"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1017"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1014"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1085"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1082"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../qt-ui/profile/profilewidget2.cpp" line="1086"/> + <location filename="../qt-ui/profile/profilewidget2.cpp" line="1083"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> @@ -2574,7 +2589,7 @@ p, li { white-space: pre-wrap; } <translation>AIR</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="212"/> + <location filename="../qt-ui/diveplanner.cpp" line="210"/> <source>Remove this point</source> <translation>Remove this point</translation> </message> @@ -2644,22 +2659,22 @@ p, li { white-space: pre-wrap; } <translation>cuft</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="520"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="521"/> <source>Invalid response from server</source> <translation>Invalid response from server</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="528"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="529"/> <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"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="575"/> <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"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="582"/> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> @@ -2824,42 +2839,47 @@ p, li { white-space: pre-wrap; } <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="337"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="338"/> <source>Webservice</source> <translation>Webservice</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="400"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="401"/> <source>Connecting...</source> <translation>Connecting...</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="419"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="420"/> <source>Download finished</source> <translation>Download finished</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="433"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="434"/> <source>Download error: %1</source> <translation>Download error: %1</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="443"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="444"/> <source>Connection error: </source> <translation>Connection error: </translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="452"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="453"/> <source>Download successful</source> <translation>Download successful</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="446"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="447"/> <source>Invalid user identifier!</source> <translation>Invalid user identifier!</translation> </message> <message> - <location filename="../qt-ui/subsurfacewebservices.cpp" line="449"/> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="321"/> + <source>Enter User ID and click Download</source> + <translation>Enter User ID and click download</translation> + </message> + <message> + <location filename="../qt-ui/subsurfacewebservices.cpp" line="450"/> <source>Cannot parse response!</source> <translation>Cannot parse response!</translation> </message> @@ -2901,42 +2921,42 @@ p, li { white-space: pre-wrap; } <context> <name>UpdateManager</name> <message> - <location filename="../qt-ui/updatemanager.cpp" line="35"/> + <location filename="../qt-ui/updatemanager.cpp" line="33"/> <source>Check for updates.</source> <translation>Check for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="36"/> + <location filename="../qt-ui/updatemanager.cpp" line="34"/> <source>Subsurface was unable to check for updates.</source> <translation>Subsurface was unable to check for updates.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="41"/> + <location filename="../qt-ui/updatemanager.cpp" line="39"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="42"/> + <location filename="../qt-ui/updatemanager.cpp" line="40"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="51"/> + <location filename="../qt-ui/updatemanager.cpp" line="49"/> <source>You are using the latest version of subsurface.</source> <translation>You are using the latest version of subsurface.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="53"/> + <location filename="../qt-ui/updatemanager.cpp" line="51"/> <source>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</source> <translation>A new version of subsurface is available.<br/>Click on:<br/><a href="%1">%1</a><br/> to download it.</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="56"/> + <location filename="../qt-ui/updatemanager.cpp" line="54"/> <source><b>A new version of subsurface is available.</b><br/><br/>%1</source> <translation><b>A new version of subsurface is available.</b><br/><br/>%1</translation> </message> <message> - <location filename="../qt-ui/updatemanager.cpp" line="59"/> + <location filename="../qt-ui/updatemanager.cpp" line="57"/> <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> @@ -2949,8 +2969,8 @@ p, li { white-space: pre-wrap; } <translation>User Manual</translation> </message> <message> - <location filename="../qt-ui/usermanual.cpp" line="70"/> - <location filename="../qt-ui/usermanual.cpp" line="76"/> + <location filename="../qt-ui/usermanual.cpp" line="72"/> + <location filename="../qt-ui/usermanual.cpp" line="78"/> <source>Cannot find the Subsurface manual</source> <translation>Cannot find the Subsurface manual</translation> </message> @@ -3039,27 +3059,27 @@ Language: %1</source> Language: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="74"/> + <location filename="../qt-ui/usersurvey.cpp" line="72"/> <source>Should we ask you later?</source> <translation>Should we ask you later?</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="75"/> + <location filename="../qt-ui/usersurvey.cpp" line="73"/> <source>Don't ask me again</source> <translation>Don't ask me again</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="76"/> + <location filename="../qt-ui/usersurvey.cpp" line="74"/> <source>Ask later</source> <translation>Ask later</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="96"/> + <location filename="../qt-ui/usersurvey.cpp" line="94"/> <source>Submit user survey.</source> <translation>Submit user survey.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="77"/> + <location filename="../qt-ui/usersurvey.cpp" line="75"/> <source>Ask again?</source> <translation>Ask again?</translation> </message> @@ -3071,27 +3091,27 @@ OS CPU Architecture: %1</source> OS CPU Architecture: %1</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="97"/> + <location filename="../qt-ui/usersurvey.cpp" line="95"/> <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="102"/> + <location filename="../qt-ui/usersurvey.cpp" line="100"/> <source>The following error occurred:</source> <translation>The following error occurred:</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="103"/> + <location filename="../qt-ui/usersurvey.cpp" line="101"/> <source>Please check your internet connection.</source> <translation>Please check your internet connection.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="112"/> + <location filename="../qt-ui/usersurvey.cpp" line="110"/> <source>Survey successfully submitted.</source> <translation>Survey successfully submitted.</translation> </message> <message> - <location filename="../qt-ui/usersurvey.cpp" line="117"/> + <location filename="../qt-ui/usersurvey.cpp" line="115"/> <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> @@ -3271,13 +3291,13 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="128"/> - <location filename="../qt-gui.cpp" line="323"/> + <location filename="../qt-gui.cpp" line="329"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="132"/> - <location filename="../qt-gui.cpp" line="326"/> + <location filename="../qt-gui.cpp" line="332"/> <source>psi</source> <translation>psi</translation> </message> @@ -3288,16 +3308,16 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="203"/> - <location filename="../qt-gui.cpp" line="205"/> - <location filename="../qt-gui.cpp" line="220"/> + <location filename="../qt-gui.cpp" line="211"/> + <location filename="../qt-gui.cpp" line="226"/> <location filename="../worldmap-save.c" line="44"/> <source>m</source> <translation>m</translation> </message> <message> <location filename="../dive.c" line="208"/> - <location filename="../qt-gui.cpp" line="208"/> - <location filename="../qt-gui.cpp" line="222"/> + <location filename="../qt-gui.cpp" line="214"/> + <location filename="../qt-gui.cpp" line="228"/> <source>ft</source> <translation>ft</translation> </message> @@ -3323,15 +3343,15 @@ Maximum</translation> </message> <message> <location filename="../dive.c" line="259"/> - <location filename="../qt-gui.cpp" line="231"/> - <location filename="../qt-gui.cpp" line="241"/> + <location filename="../qt-gui.cpp" line="237"/> + <location filename="../qt-gui.cpp" line="247"/> <source>lbs</source> <translation>lbs</translation> </message> <message> <location filename="../dive.c" line="263"/> - <location filename="../qt-gui.cpp" line="229"/> - <location filename="../qt-gui.cpp" line="239"/> + <location filename="../qt-gui.cpp" line="235"/> + <location filename="../qt-gui.cpp" line="245"/> <source>kg</source> <translation>kg</translation> </message> @@ -3341,36 +3361,36 @@ Maximum</translation> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../divelist.c" line="467"/> - <location filename="../equipment.c" line="104"/> - <location filename="../planner.c" line="986"/> - <location filename="../planner.c" line="989"/> + <location filename="../divelist.c" line="460"/> + <location filename="../equipment.c" line="79"/> + <location filename="../planner.c" line="988"/> + <location filename="../planner.c" line="991"/> <location filename="../statistics.c" line="355"/> <source>air</source> <translation>air</translation> </message> <message> - <location filename="../equipment.c" line="210"/> + <location filename="../equipment.c" line="185"/> <source>integrated</source> <translation>integrated</translation> </message> <message> - <location filename="../equipment.c" line="211"/> + <location filename="../equipment.c" line="186"/> <source>belt</source> <translation>belt</translation> </message> <message> - <location filename="../equipment.c" line="212"/> + <location filename="../equipment.c" line="187"/> <source>ankle</source> <translation>ankle</translation> </message> <message> - <location filename="../equipment.c" line="213"/> + <location filename="../equipment.c" line="188"/> <source>backplate weight</source> <translation>backplate weight</translation> </message> <message> - <location filename="../equipment.c" line="214"/> + <location filename="../equipment.c" line="189"/> <source>clip-on</source> <translation>clip-on</translation> </message> @@ -3681,131 +3701,130 @@ Maximum</translation> <translation>Can't open stylesheet %s</translation> </message> <message> - <location filename="../equipment.c" line="106"/> + <location filename="../equipment.c" line="81"/> <source>EAN%d</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="159"/> - <location filename="../planner.c" line="761"/> + <location filename="../planner.c" line="763"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../planner.c" line="345"/> + <location filename="../planner.c" line="347"/> <source>Too many gas mixes</source> <translation>Too many gas mixes</translation> </message> <message> - <location filename="../planner.c" line="526"/> + <location filename="../planner.c" line="528"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTION BASED ON IT, WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</translation> </message> <message> - <location filename="../planner.c" line="535"/> + <location filename="../planner.c" line="537"/> <source>based on GFlow = %d and GFhigh = %d</source> <translation>based on GFlow = %d and GFhigh = %d</translation> </message> <message> - <location filename="../planner.c" line="538"/> + <location filename="../planner.c" line="540"/> <source>Subsurface dive plan</source> <translation>Subsurface dive plan</translation> </message> <message> - <location filename="../planner.c" line="542"/> + <location filename="../planner.c" line="544"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../planner.c" line="545"/> + <location filename="../planner.c" line="547"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../planner.c" line="548"/> + <location filename="../planner.c" line="550"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../planner.c" line="551"/> + <location filename="../planner.c" line="553"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../planner.c" line="585"/> + <location filename="../planner.c" line="587"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="595"/> + <location filename="../planner.c" line="597"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../planner.c" line="606"/> + <location filename="../planner.c" line="608"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../planner.c" line="609"/> - <location filename="../planner.c" line="613"/> + <location filename="../planner.c" line="611"/> + <location filename="../planner.c" line="615"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../planner.c" line="629"/> + <location filename="../planner.c" line="631"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../planner.c" line="642"/> + <location filename="../planner.c" line="644"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../planner.c" line="644"/> + <location filename="../planner.c" line="646"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="647"/> + <location filename="../planner.c" line="649"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> - <location filename="../planner.c" line="667"/> - <location filename="../planner.c" line="672"/> - <location filename="../planner.c" line="695"/> + <location filename="../planner.c" line="669"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="697"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../planner.c" line="668"/> + <location filename="../planner.c" line="670"/> <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="673"/> + <location filename="../planner.c" line="675"/> <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="675"/> + <location filename="../planner.c" line="677"/> <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="677"/> + <location filename="../planner.c" line="679"/> <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="692"/> + <location filename="../planner.c" line="694"/> <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="990"/> + <location filename="../planner.c" line="992"/> <source>ean</source> <translation>ean</translation> </message> @@ -4040,22 +4059,22 @@ EADD: %d%s <translation>%s %sP:%d %s</translation> </message> <message> - <location filename="../qt-gui.cpp" line="281"/> + <location filename="../qt-gui.cpp" line="287"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../qt-gui.cpp" line="284"/> + <location filename="../qt-gui.cpp" line="290"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../qt-gui.cpp" line="417"/> + <location filename="../qt-gui.cpp" line="427"/> <source>%1 %2 (%3 dives)</source> <translation>%1 %2 (%3 dives)</translation> </message> <message> - <location filename="../qt-gui.cpp" line="422"/> + <location filename="../qt-gui.cpp" line="432"/> <source>%1 %2 (1 dive)</source> <translation>%1 %2 (1 dive)</translation> </message> @@ -4205,97 +4224,97 @@ EADD: %d%s <translation>(no dives)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="77"/> + <location filename="../subsurfacestartup.c" line="79"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="86"/> + <location filename="../subsurfacestartup.c" line="88"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="87"/> + <location filename="../subsurfacestartup.c" line="89"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -4617,21 +4636,6 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/plannerSettings.ui" line="94"/> - <source>75%-50% avg. depth</source> - <translation>75%-50% avg. depth</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="111"/> - <source>50% avg. depth - 6m/20ft</source> - <translation>50% avg. depth - 6m/20ft</translation> - </message> - <message> - <location filename="../qt-ui/plannerSettings.ui" line="128"/> - <source>6m/20ft to surface</source> - <translation>6m/20ft to surface</translation> - </message> - <message> <location filename="../qt-ui/plannerSettings.ui" line="148"/> <source>Descent</source> <translation>Descent</translation> @@ -4663,8 +4667,8 @@ Is the Uemis Zurich plugged in correctly?</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> - <source>Last Stop at 6m/20ft</source> - <translation>Last Stop at 6m/20ft</translation> + <source>Last stop at 6m</source> + <translation>Last stop at 6m</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="295"/> @@ -4728,6 +4732,21 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>bar</translation> </message> <message> + <location filename="../qt-ui/plannerSettings.ui" line="94"/> + <source>75% to 50% avg. depth</source> + <translation>75% to 50% avg. depth</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="111"/> + <source>50% avg. depth to 6m</source> + <translation>50% avg. depth to 6m</translation> + </message> + <message> + <location filename="../qt-ui/plannerSettings.ui" line="128"/> + <source>6m to surface</source> + <translation>6m to surface</translation> + </message> + <message> <location filename="../qt-ui/plannerSettings.ui" line="442"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>In dive plan, show runtime (absolute time) of stops</translation> |