From 2629e768bd2248a652686589186b50bec51fe044 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Fri, 6 Dec 2013 13:11:44 -0800
Subject: Latest source strings
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
translations/subsurface_source.ts | 809 ++++++++++++++++++++++----------------
1 file changed, 468 insertions(+), 341 deletions(-)
diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts
index 6f925a96c..b945bca42 100644
--- a/translations/subsurface_source.ts
+++ b/translations/subsurface_source.ts
@@ -64,12 +64,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+ <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
<source>Open CSV Log File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+ <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
<source>CSV Files (*.csv)</source>
<translation type="unfinished"></translation>
</message>
@@ -77,57 +77,57 @@
<context>
<name>CylindersModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
+ <location filename="../qt-ui/models.cpp" line="68"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
+ <location filename="../qt-ui/models.cpp" line="68"/>
<source>Size</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
+ <location filename="../qt-ui/models.cpp" line="68"/>
<source>WorkPress</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
+ <location filename="../qt-ui/models.cpp" line="68"/>
<source>StartPress</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
+ <location filename="../qt-ui/models.cpp" line="68"/>
<source>EndPress</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
- <source>O2%</source>
+ <location filename="../qt-ui/models.cpp" line="68"/>
+ <source>Switch at</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
- <source>Switch at</source>
+ <location filename="../qt-ui/models.cpp" line="68"/>
+ <source>He%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="66"/>
- <source>He%</source>
+ <location filename="../qt-ui/models.cpp" line="68"/>
+ <source>O</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="164"/>
+ <location filename="../qt-ui/models.cpp" line="166"/>
<source>Clicking here will remove this cylinder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="386"/>
+ <location filename="../qt-ui/models.cpp" line="388"/>
<source>Cylinder cannot be removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="387"/>
+ <location filename="../qt-ui/models.cpp" line="389"/>
<source>This gas in use. Only cylinders that are not used in the dive can be removed.</source>
<translation type="unfinished"></translation>
</message>
@@ -154,22 +154,22 @@
<context>
<name>DiveComputerModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1243"/>
+ <location filename="../qt-ui/models.cpp" line="1245"/>
<source>Model</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1243"/>
+ <location filename="../qt-ui/models.cpp" line="1245"/>
<source>Device ID</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1243"/>
+ <location filename="../qt-ui/models.cpp" line="1245"/>
<source>Nickname</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1265"/>
+ <location filename="../qt-ui/models.cpp" line="1267"/>
<source>Clicking here will remove this divecomputer.</source>
<translation type="unfinished"></translation>
</message>
@@ -177,12 +177,12 @@
<context>
<name>DiveItem</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1104"/>
+ <location filename="../qt-ui/models.cpp" line="1106"/>
<source> l/min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1106"/>
+ <location filename="../qt-ui/models.cpp" line="1108"/>
<source> cuft/min</source>
<translation type="unfinished"></translation>
</message>
@@ -195,87 +195,82 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="368"/>
- <source>Visible:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qt-ui/divelistview.cpp" line="683"/>
+ <location filename="../qt-ui/divelistview.cpp" line="680"/>
<source>expand all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="684"/>
+ <location filename="../qt-ui/divelistview.cpp" line="681"/>
<source>collapse all</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="685"/>
+ <location filename="../qt-ui/divelistview.cpp" line="682"/>
<source>collapse others</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="687"/>
+ <location filename="../qt-ui/divelistview.cpp" line="684"/>
<source>remove dive(s) from trip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="688"/>
+ <location filename="../qt-ui/divelistview.cpp" line="685"/>
<source>create new trip above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="689"/>
+ <location filename="../qt-ui/divelistview.cpp" line="686"/>
<source>add dive(s) to trip immediately above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="692"/>
+ <location filename="../qt-ui/divelistview.cpp" line="689"/>
<source>merge trip with trip above</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="693"/>
+ <location filename="../qt-ui/divelistview.cpp" line="690"/>
<source>merge trip with trip below</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="697"/>
+ <location filename="../qt-ui/divelistview.cpp" line="694"/>
<source>delete dive(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="701"/>
+ <location filename="../qt-ui/divelistview.cpp" line="698"/>
<source>save As</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="702"/>
+ <location filename="../qt-ui/divelistview.cpp" line="699"/>
<source>export As UDDF</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="703"/>
+ <location filename="../qt-ui/divelistview.cpp" line="700"/>
<source>shift times</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="730"/>
+ <location filename="../qt-ui/divelistview.cpp" line="727"/>
<source>Save Dives As...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="749"/>
+ <location filename="../qt-ui/divelistview.cpp" line="746"/>
<source>Save File as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="750"/>
+ <location filename="../qt-ui/divelistview.cpp" line="747"/>
<source>UDDF files (*.uddf *.UDDF)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/divelistview.cpp" line="699"/>
+ <location filename="../qt-ui/divelistview.cpp" line="696"/>
<source>merge selected dives</source>
<translation type="unfinished"></translation>
</message>
@@ -303,23 +298,17 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="105"/>
- <location filename="../qt-ui/diveplanner.ui" line="118"/>
- <source>%</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qt-ui/diveplanner.ui" line="128"/>
+ <location filename="../qt-ui/diveplanner.ui" line="125"/>
<source>Last Stop at 6m</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="177"/>
+ <location filename="../qt-ui/diveplanner.ui" line="174"/>
<source>Start Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/diveplanner.ui" line="184"/>
+ <location filename="../qt-ui/diveplanner.ui" line="181"/>
<source>ATM Pressure</source>
<translation type="unfinished"></translation>
</message>
@@ -407,71 +396,142 @@ Please, remove them first.</source>
<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1147"/>
+ <location filename="../qt-ui/models.cpp" line="1149"/>
<source>#</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1148"/>
+ <location filename="../qt-ui/models.cpp" line="1150"/>
<source>date</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1150"/>
+ <location filename="../qt-ui/models.cpp" line="1152"/>
<source>m</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1150"/>
+ <location filename="../qt-ui/models.cpp" line="1152"/>
<source>ft</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1151"/>
+ <location filename="../qt-ui/models.cpp" line="1153"/>
<source>min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1153"/>
+ <location filename="../qt-ui/models.cpp" line="1155"/>
<source>kg</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1153"/>
+ <location filename="../qt-ui/models.cpp" line="1155"/>
<source>lbs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1154"/>
+ <location filename="../qt-ui/models.cpp" line="1156"/>
<source>suit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1155"/>
+ <location filename="../qt-ui/models.cpp" line="1157"/>
<source>cyl</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1160"/>
+ <location filename="../qt-ui/models.cpp" line="1162"/>
<source>location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1157"/>
+ <location filename="../qt-ui/models.cpp" line="1159"/>
<source>SAC</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1158"/>
+ <location filename="../qt-ui/models.cpp" line="1160"/>
<source>OTU</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1159"/>
+ <location filename="../qt-ui/models.cpp" line="1161"/>
<source>maxCNS</source>
<translation type="unfinished"></translation>
</message>
</context>
+<context>
+ <name>DivelogsDeWebServices</name>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/>
+ <source>Invalid response from server</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+ <source>Expected XML tag 'DiveDateReader', got instead '%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+ <source>Expected XML tag 'DiveDates' not found</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+ <source>Malformed XML response. Line %1: %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+ <source>Uploading dive list...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+ <source>Downloading dive list...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+ <source>Downloading %1 dives...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+ <source>Download finished - %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+ <source>Corrupted download</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+ <source>The archive could not be opened:
+%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+ <source>The archive contains corrupt data:
+%1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+ <source>Upload finished</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+ <source>Download error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
<context>
<name>DownloadFromDCWidget</name>
<message>
@@ -551,13 +611,13 @@ Please, remove them first.</source>
<name>MainTab</name>
<message>
<location filename="../qt-ui/maintab.ui" line="18"/>
- <location filename="../qt-ui/maintab.cpp" line="367"/>
+ <location filename="../qt-ui/maintab.cpp" line="413"/>
<source>Dive Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="120"/>
- <location filename="../qt-ui/maintab.cpp" line="391"/>
+ <location filename="../qt-ui/maintab.cpp" line="437"/>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
@@ -613,7 +673,7 @@ Please, remove them first.</source>
</message>
<message>
<location filename="../qt-ui/maintab.ui" line="208"/>
- <location filename="../qt-ui/maintab.cpp" line="392"/>
+ <location filename="../qt-ui/maintab.cpp" line="438"/>
<source>Notes</source>
<translation type="unfinished"></translation>
</message>
@@ -628,191 +688,188 @@ Please, remove them first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="384"/>
+ <location filename="../qt-ui/maintab.ui" line="387"/>
<source>Date</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="403"/>
+ <location filename="../qt-ui/maintab.ui" line="406"/>
<source>Interval</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="422"/>
+ <location filename="../qt-ui/maintab.ui" line="425"/>
<source>Gases Used</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="441"/>
+ <location filename="../qt-ui/maintab.ui" line="444"/>
<source>Gas Consumed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="460"/>
- <location filename="../qt-ui/maintab.ui" line="715"/>
+ <location filename="../qt-ui/maintab.ui" line="463"/>
+ <location filename="../qt-ui/maintab.ui" line="721"/>
<source>SAC</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="479"/>
+ <location filename="../qt-ui/maintab.ui" line="482"/>
<source>Max. Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="498"/>
+ <location filename="../qt-ui/maintab.ui" line="501"/>
<source>Ave. Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="517"/>
+ <location filename="../qt-ui/maintab.ui" line="520"/>
<source>OTU</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="536"/>
+ <location filename="../qt-ui/maintab.ui" line="539"/>
<source>Air Pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="555"/>
+ <location filename="../qt-ui/maintab.ui" line="558"/>
<source>Air Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="574"/>
+ <location filename="../qt-ui/maintab.ui" line="577"/>
<source>Water Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="593"/>
+ <location filename="../qt-ui/maintab.ui" line="596"/>
<source>Dive Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="612"/>
+ <location filename="../qt-ui/maintab.ui" line="615"/>
<source>Salinity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="649"/>
+ <location filename="../qt-ui/maintab.ui" line="652"/>
<source>Stats</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="691"/>
+ <location filename="../qt-ui/maintab.ui" line="697"/>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="703"/>
+ <location filename="../qt-ui/maintab.ui" line="709"/>
<source>Temperature</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="727"/>
+ <location filename="../qt-ui/maintab.ui" line="733"/>
<source>Duration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="739"/>
+ <location filename="../qt-ui/maintab.ui" line="745"/>
<source>Total Time</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.ui" line="758"/>
+ <location filename="../qt-ui/maintab.ui" line="764"/>
<source>Dives</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="78"/>
+ <location filename="../qt-ui/maintab.cpp" line="73"/>
<source>Cylinders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="79"/>
+ <location filename="../qt-ui/maintab.cpp" line="74"/>
<source>Add Cylinder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="82"/>
+ <location filename="../qt-ui/maintab.cpp" line="77"/>
<source>Weights</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="83"/>
+ <location filename="../qt-ui/maintab.cpp" line="78"/>
<source>Add Weight System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="362"/>
+ <location filename="../qt-ui/maintab.cpp" line="408"/>
<source>Trip Location</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="340"/>
- <location filename="../qt-ui/maintab.cpp" line="364"/>
+ <location filename="../qt-ui/maintab.cpp" line="386"/>
+ <location filename="../qt-ui/maintab.cpp" line="410"/>
<source>Trip Notes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="40"/>
+ <location filename="../qt-ui/maintab.cpp" line="37"/>
<source>Save</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="45"/>
+ <location filename="../qt-ui/maintab.cpp" line="41"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="178"/>
- <location filename="../qt-ui/maintab.cpp" line="180"/>
+ <location filename="../qt-ui/maintab.cpp" line="231"/>
<source>This trip is being edited.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="187"/>
- <location filename="../qt-ui/maintab.cpp" line="188"/>
+ <location filename="../qt-ui/maintab.cpp" line="237"/>
<source>Multiple dives are being edited.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="190"/>
- <location filename="../qt-ui/maintab.cpp" line="191"/>
+ <location filename="../qt-ui/maintab.cpp" line="239"/>
<source>This dive is being edited.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="408"/>
- <location filename="../qt-ui/maintab.cpp" line="416"/>
- <location filename="../qt-ui/maintab.cpp" line="445"/>
- <location filename="../qt-ui/maintab.cpp" line="446"/>
- <location filename="../qt-ui/maintab.cpp" line="447"/>
+ <location filename="../qt-ui/maintab.cpp" line="454"/>
+ <location filename="../qt-ui/maintab.cpp" line="462"/>
+ <location filename="../qt-ui/maintab.cpp" line="491"/>
+ <location filename="../qt-ui/maintab.cpp" line="492"/>
+ <location filename="../qt-ui/maintab.cpp" line="493"/>
<source>/min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="410"/>
+ <location filename="../qt-ui/maintab.cpp" line="456"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="905"/>
+ <location filename="../qt-ui/maintab.cpp" line="957"/>
<source>N</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="905"/>
+ <location filename="../qt-ui/maintab.cpp" line="957"/>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="906"/>
+ <location filename="../qt-ui/maintab.cpp" line="958"/>
<source>E</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/maintab.cpp" line="906"/>
+ <location filename="../qt-ui/maintab.cpp" line="958"/>
<source>W</source>
<translation type="unfinished"></translation>
</message>
@@ -919,7 +976,7 @@ Please, remove them first.</source>
<message>
<location filename="../qt-ui/mainwindow.ui" line="300"/>
<location filename="../qt-ui/mainwindow.ui" line="303"/>
- <location filename="../qt-ui/mainwindow.cpp" line="167"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="169"/>
<source>Import Files</source>
<translation type="unfinished"></translation>
</message>
@@ -1154,84 +1211,89 @@ Please, remove them first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="111"/>
<source>Open File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="144"/>
- <location filename="../qt-ui/mainwindow.cpp" line="250"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="146"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="252"/>
<source>Please save or cancel the current dive edit before closing the file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="223"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="225"/>
<source>Please save or cancel the current dive edit before trying to plan a dive.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="286"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="288"/>
<source>Please save or cancel the current dive edit before trying to add a dive.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+ <source>User Manual</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/mainwindow.cpp" line="504"/>
<source>Cannot find the Subsurface manual</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="527"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="541"/>
<source>Do you want to save the changes you made in the file %1?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="529"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="543"/>
<source>Do you want to save the changes you made in the datafile?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="548"/>
<source>Save Changes?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="535"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="549"/>
<source>Changes will be lost if you don't save them.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="847"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="865"/>
<source>First finish the current edition before trying to do another.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="196"/>
- <location filename="../qt-ui/mainwindow.cpp" line="729"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="743"/>
<source>Save File as</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="107"/>
- <location filename="../qt-ui/mainwindow.cpp" line="144"/>
- <location filename="../qt-ui/mainwindow.cpp" line="223"/>
- <location filename="../qt-ui/mainwindow.cpp" line="250"/>
- <location filename="../qt-ui/mainwindow.cpp" line="286"/>
- <location filename="../qt-ui/mainwindow.cpp" line="847"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="146"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="225"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="252"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="288"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="865"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="107"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="108"/>
<source>Please save or cancel the current dive edit before opening a new file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="199"/>
<source>UDDF files (*.uddf *.UDDF)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/mainwindow.cpp" line="730"/>
+ <location filename="../qt-ui/mainwindow.cpp" line="744"/>
<source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
<translation type="unfinished"></translation>
</message>
@@ -1254,239 +1316,259 @@ Please, remove them first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="131"/>
+ <location filename="../qt-ui/preferences.ui" line="115"/>
+ <source>Language</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="141"/>
<source>Lists and Tables</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="137"/>
+ <location filename="../qt-ui/preferences.ui" line="147"/>
<source>Font</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="147"/>
+ <location filename="../qt-ui/preferences.ui" line="157"/>
<source>Font size</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="160"/>
+ <location filename="../qt-ui/preferences.ui" line="170"/>
<source>Dives</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="166"/>
+ <location filename="../qt-ui/preferences.ui" line="176"/>
<source>Default Dive file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="178"/>
+ <location filename="../qt-ui/preferences.ui" line="188"/>
<source>...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="187"/>
+ <location filename="../qt-ui/preferences.ui" line="197"/>
<source>Display Invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="204"/>
+ <location filename="../qt-ui/preferences.ui" line="214"/>
<source>Default Cylinder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="210"/>
+ <location filename="../qt-ui/preferences.ui" line="220"/>
<source>Use Default Cylinder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="246"/>
+ <location filename="../qt-ui/preferences.ui" line="256"/>
<source>System</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="253"/>
+ <location filename="../qt-ui/preferences.ui" line="263"/>
<source>Metric</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="263"/>
+ <location filename="../qt-ui/preferences.ui" line="273"/>
<source>Imperial</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="273"/>
+ <location filename="../qt-ui/preferences.ui" line="283"/>
<source>Personalize</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="297"/>
+ <location filename="../qt-ui/preferences.ui" line="307"/>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="304"/>
- <source>Meter</source>
+ <location filename="../qt-ui/preferences.ui" line="314"/>
+ <source>meter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="314"/>
- <source>Feet</source>
+ <location filename="../qt-ui/preferences.ui" line="324"/>
+ <source>feet</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="324"/>
- <source>Pressure</source>
+ <location filename="../qt-ui/preferences.ui" line="341"/>
+ <source>bar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="331"/>
- <source>Bar</source>
+ <location filename="../qt-ui/preferences.ui" line="351"/>
+ <source>psi</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="341"/>
- <source>Psi</source>
+ <location filename="../qt-ui/preferences.ui" line="368"/>
+ <source>liter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="351"/>
- <source>Volume</source>
+ <location filename="../qt-ui/preferences.ui" line="378"/>
+ <source>cu ft</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="358"/>
- <source>Liter</source>
+ <location filename="../qt-ui/preferences.ui" line="395"/>
+ <source>celsius</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="368"/>
- <source>CuFt</source>
+ <location filename="../qt-ui/preferences.ui" line="405"/>
+ <source>fahrenheit</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="378"/>
- <source>Temperature</source>
+ <location filename="../qt-ui/preferences.ui" line="422"/>
+ <source>kg</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message utf8="true">
+ <location filename="../qt-ui/preferences.ui" line="510"/>
+ <source>pO₂</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message utf8="true">
+ <location filename="../qt-ui/preferences.ui" line="551"/>
+ <source>pN₂</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="385"/>
- <source>Celsius</source>
+ <location filename="../qt-ui/preferences.ui" line="837"/>
+ <source>System Default</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="395"/>
- <source>Fahrenheit</source>
+ <location filename="../qt-ui/preferences.ui" line="857"/>
+ <source>Filter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="405"/>
- <source>Weight</source>
+ <location filename="../qt-ui/preferences.ui" line="334"/>
+ <source>Pressure</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="412"/>
- <source>Kg</source>
+ <location filename="../qt-ui/preferences.ui" line="361"/>
+ <source>Volume</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="422"/>
+ <location filename="../qt-ui/preferences.ui" line="388"/>
+ <source>Temperature</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="415"/>
+ <source>Weight</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.ui" line="432"/>
<source>lbs</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="437"/>
+ <location filename="../qt-ui/preferences.ui" line="447"/>
<source>Time units</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="443"/>
+ <location filename="../qt-ui/preferences.ui" line="453"/>
<source>Ascent/Descent speed denominator</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="450"/>
+ <location filename="../qt-ui/preferences.ui" line="460"/>
<source>Minutes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="460"/>
+ <location filename="../qt-ui/preferences.ui" line="470"/>
<source>Seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="492"/>
+ <location filename="../qt-ui/preferences.ui" line="502"/>
<source>Show</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="500"/>
- <source>pO2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="523"/>
- <location filename="../qt-ui/preferences.ui" line="564"/>
- <location filename="../qt-ui/preferences.ui" line="605"/>
+ <location filename="../qt-ui/preferences.ui" line="533"/>
+ <location filename="../qt-ui/preferences.ui" line="574"/>
+ <location filename="../qt-ui/preferences.ui" line="615"/>
<source>threshold</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="541"/>
- <source>pN2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="582"/>
+ <location filename="../qt-ui/preferences.ui" line="592"/>
<source>pHe</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="623"/>
+ <location filename="../qt-ui/preferences.ui" line="633"/>
<source>MOD</source>
<translation type="unfinished"></translation>
</message>
+ <message utf8="true">
+ <location filename="../qt-ui/preferences.ui" line="656"/>
+ <source>max ppO₂</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
- <location filename="../qt-ui/preferences.ui" line="662"/>
+ <location filename="../qt-ui/preferences.ui" line="672"/>
<source>EAD END EADD</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="671"/>
+ <location filename="../qt-ui/preferences.ui" line="681"/>
<source>Dive computer reported ceiling</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="694"/>
+ <location filename="../qt-ui/preferences.ui" line="704"/>
<source>draw ceiling red</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="705"/>
+ <location filename="../qt-ui/preferences.ui" line="715"/>
<source>Calculated ceiling</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="728"/>
+ <location filename="../qt-ui/preferences.ui" line="738"/>
<source>show all tissues</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="738"/>
+ <location filename="../qt-ui/preferences.ui" line="748"/>
<source>3m increments</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="748"/>
+ <location filename="../qt-ui/preferences.ui" line="758"/>
<source>Calculate NDL/TTS</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="797"/>
+ <location filename="../qt-ui/preferences.ui" line="821"/>
<source>GFLow at max depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="771"/>
+ <location filename="../qt-ui/preferences.ui" line="781"/>
<source>Misc</source>
<translation type="unfinished"></translation>
</message>
@@ -1496,32 +1578,37 @@ Please, remove them first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="646"/>
- <source>max PPO2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../qt-ui/preferences.ui" line="759"/>
+ <location filename="../qt-ui/preferences.ui" line="769"/>
<source>SAC</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="777"/>
+ <location filename="../qt-ui/preferences.ui" line="787"/>
<source>GFLow</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.ui" line="787"/>
+ <location filename="../qt-ui/preferences.ui" line="804"/>
<source>GFHigh</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="187"/>
+ <location filename="../qt-ui/preferences.cpp" line="193"/>
+ <source>Restart required</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.cpp" line="194"/>
+ <source>To correctly load a new language you must restart Subsurface.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/preferences.cpp" line="227"/>
<source>Open Default Log File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/preferences.cpp" line="187"/>
+ <location filename="../qt-ui/preferences.cpp" line="227"/>
<source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
<translation type="unfinished"></translation>
</message>
@@ -1529,12 +1616,22 @@ Please, remove them first.</source>
<context>
<name>PrintDialog</name>
<message>
- <location filename="../qt-ui/printdialog.cpp" line="32"/>
- <source>&Print</source>
+ <location filename="../qt-ui/printdialog.cpp" line="39"/>
+ <source>&Preview</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printdialog.cpp" line="39"/>
+ <location filename="../qt-ui/printdialog.cpp" line="43"/>
+ <source>P&rint</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/printdialog.cpp" line="47"/>
+ <source>&Close</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/printdialog.cpp" line="61"/>
<source>Print</source>
<translation type="unfinished"></translation>
</message>
@@ -1542,37 +1639,37 @@ Please, remove them first.</source>
<context>
<name>PrintLayout</name>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="24"/>
+ <location filename="../qt-ui/printlayout.cpp" line="25"/>
<source>Dive#</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="25"/>
+ <location filename="../qt-ui/printlayout.cpp" line="26"/>
<source>Date</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="26"/>
+ <location filename="../qt-ui/printlayout.cpp" line="27"/>
<source>Depth</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="27"/>
+ <location filename="../qt-ui/printlayout.cpp" line="28"/>
<source>Duration</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="28"/>
+ <location filename="../qt-ui/printlayout.cpp" line="29"/>
<source>Master</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="29"/>
+ <location filename="../qt-ui/printlayout.cpp" line="30"/>
<source>Buddy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/printlayout.cpp" line="30"/>
+ <location filename="../qt-ui/printlayout.cpp" line="31"/>
<source>Location</source>
<translation type="unfinished"></translation>
</message>
@@ -1736,30 +1833,45 @@ Please, remove them first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="732"/>
- <location filename="../qt-ui/profilegraphics.cpp" line="984"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="616"/>
+ <source>Pn2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+ <source>PHE</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+ <source>PO2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
<source>air</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="734"/>
- <location filename="../qt-ui/profilegraphics.cpp" line="986"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="756"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="1008"/>
<source>EAN%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="994"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="1016"/>
<source>Bailing out to OC</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="996"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="1018"/>
<source> begin</source>
<comment>Starts with space!</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="997"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="1019"/>
<source> end</source>
<comment>Starts with space!</comment>
<translation type="unfinished"></translation>
@@ -1768,72 +1880,72 @@ Please, remove them first.</source>
<context>
<name>ProfilePrintModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1600"/>
+ <location filename="../qt-ui/models.cpp" line="1618"/>
<source>unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1605"/>
+ <location filename="../qt-ui/models.cpp" line="1623"/>
<source>Dive #%1 - %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1608"/>
+ <location filename="../qt-ui/models.cpp" line="1626"/>
<source>Max depth: %1 %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1615"/>
+ <location filename="../qt-ui/models.cpp" line="1633"/>
<source>Duration: %1 min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1620"/>
+ <location filename="../qt-ui/models.cpp" line="1638"/>
<source>Gas Used:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1622"/>
+ <location filename="../qt-ui/models.cpp" line="1640"/>
<source>SAC:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1624"/>
+ <location filename="../qt-ui/models.cpp" line="1642"/>
<source>Max. CNS:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1626"/>
+ <location filename="../qt-ui/models.cpp" line="1644"/>
<source>Weights:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1631"/>
+ <location filename="../qt-ui/models.cpp" line="1649"/>
<source>Notes:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1638"/>
+ <location filename="../qt-ui/models.cpp" line="1656"/>
<source>Divemaster:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1640"/>
+ <location filename="../qt-ui/models.cpp" line="1658"/>
<source>Buddy:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1642"/>
+ <location filename="../qt-ui/models.cpp" line="1660"/>
<source>Suit:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1644"/>
+ <location filename="../qt-ui/models.cpp" line="1662"/>
<source>Viz:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1646"/>
+ <location filename="../qt-ui/models.cpp" line="1664"/>
<source>Rating:</source>
<translation type="unfinished"></translation>
</message>
@@ -1850,11 +1962,6 @@ Please, remove them first.</source>
<source>Remove this Point</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../qt-ui/globe.cpp" line="244"/>
- <source>No location data - move the map and double-click to set the dive location</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
<source>Close</source>
@@ -1875,6 +1982,11 @@ Please, remove them first.</source>
<source>Maximum</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../qt-ui/globe.cpp" line="242"/>
+ <source>Move the map and double-click to set the dive location</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ Please, remove them first.</source>
<context>
<name>SubsurfaceWebServices</name>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="75"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="220"/>
<source>Webservice</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
- <source>Wait a bit until we have something...</source>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+ <source>Connecting...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
- <source>Download Finished</source>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+ <source>Download finished</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+ <source>Download error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
<source>Connection Error: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="157"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="300"/>
<source>Invalid user identifier!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="158"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="301"/>
<source>Cannot parse response!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
<source>Download Success!</source>
<translation type="unfinished"></translation>
</message>
@@ -1989,17 +2106,17 @@ Please, remove them first.</source>
<context>
<name>TankInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="769"/>
+ <location filename="../qt-ui/models.cpp" line="771"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="769"/>
+ <location filename="../qt-ui/models.cpp" line="771"/>
<source>ml</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="769"/>
+ <location filename="../qt-ui/models.cpp" line="771"/>
<source>bar</source>
<translation type="unfinished"></translation>
</message>
@@ -2007,7 +2124,7 @@ Please, remove them first.</source>
<context>
<name>ToolTipItem</name>
<message>
- <location filename="../qt-ui/profilegraphics.cpp" line="1528"/>
+ <location filename="../qt-ui/profilegraphics.cpp" line="1550"/>
<source>Information</source>
<translation type="unfinished"></translation>
</message>
@@ -2015,12 +2132,12 @@ Please, remove them first.</source>
<context>
<name>WSInfoModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="641"/>
+ <location filename="../qt-ui/models.cpp" line="643"/>
<source>Description</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="641"/>
+ <location filename="../qt-ui/models.cpp" line="643"/>
<source>kg</source>
<translation type="unfinished"></translation>
</message>
@@ -2053,30 +2170,40 @@ Please, remove them first.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/webservices.ui" line="77"/>
+ <location filename="../qt-ui/webservices.ui" line="80"/>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/webservices.ui" line="91"/>
+ <location filename="../qt-ui/webservices.ui" line="94"/>
<source>Upload</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+ <source>Operation timed out</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+ <source>Transfering data...</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>WeightModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="401"/>
+ <location filename="../qt-ui/models.cpp" line="403"/>
<source>Type</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="401"/>
+ <location filename="../qt-ui/models.cpp" line="403"/>
<source>Weight</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="461"/>
+ <location filename="../qt-ui/models.cpp" line="463"/>
<source>Clicking here will remove this weigthsystem.</source>
<translation type="unfinished"></translation>
</message>
@@ -2084,70 +2211,70 @@ Please, remove them first.</source>
<context>
<name>YearlyStatisticsModel</name>
<message>
- <location filename="../qt-ui/models.cpp" line="1419"/>
+ <location filename="../qt-ui/models.cpp" line="1421"/>
<source>Year
> Month / Trip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1420"/>
+ <location filename="../qt-ui/models.cpp" line="1422"/>
<source>#</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1421"/>
+ <location filename="../qt-ui/models.cpp" line="1423"/>
<source>Duration
Total</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1422"/>
+ <location filename="../qt-ui/models.cpp" line="1424"/>
<source>
Average</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1423"/>
+ <location filename="../qt-ui/models.cpp" line="1425"/>
<source>
Shortest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1424"/>
+ <location filename="../qt-ui/models.cpp" line="1426"/>
<source>
Longest</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1425"/>
+ <location filename="../qt-ui/models.cpp" line="1427"/>
<source>Depth (%1)
Average</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1426"/>
- <location filename="../qt-ui/models.cpp" line="1429"/>
- <location filename="../qt-ui/models.cpp" line="1432"/>
+ <location filename="../qt-ui/models.cpp" line="1428"/>
+ <location filename="../qt-ui/models.cpp" line="1431"/>
+ <location filename="../qt-ui/models.cpp" line="1434"/>
<source>
Minimum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1427"/>
- <location filename="../qt-ui/models.cpp" line="1430"/>
- <location filename="../qt-ui/models.cpp" line="1433"/>
+ <location filename="../qt-ui/models.cpp" line="1429"/>
+ <location filename="../qt-ui/models.cpp" line="1432"/>
+ <location filename="../qt-ui/models.cpp" line="1435"/>
<source>
Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1428"/>
+ <location filename="../qt-ui/models.cpp" line="1430"/>
<source>SAC (%1)
Average</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-ui/models.cpp" line="1431"/>
+ <location filename="../qt-ui/models.cpp" line="1433"/>
<source>Temp. (%1)
Average</source>
<translation type="unfinished"></translation>
@@ -2162,53 +2289,53 @@ Maximum</source>
</message>
<message>
<location filename="../dive.c" line="61"/>
- <location filename="../qt-gui.cpp" line="322"/>
+ <location filename="../qt-gui.cpp" line="330"/>
<source>bar</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="65"/>
- <location filename="../qt-gui.cpp" line="325"/>
+ <location filename="../qt-gui.cpp" line="333"/>
<source>psi</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="101"/>
- <location filename="../qt-gui.cpp" line="303"/>
+ <location filename="../qt-gui.cpp" line="311"/>
<source>l</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="106"/>
- <location filename="../qt-gui.cpp" line="306"/>
+ <location filename="../qt-gui.cpp" line="314"/>
<source>cuft</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="134"/>
- <location filename="../qt-gui.cpp" line="206"/>
- <location filename="../qt-gui.cpp" line="221"/>
+ <location filename="../qt-gui.cpp" line="214"/>
+ <location filename="../qt-gui.cpp" line="229"/>
<source>m</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="139"/>
- <location filename="../qt-gui.cpp" line="209"/>
- <location filename="../qt-gui.cpp" line="223"/>
+ <location filename="../qt-gui.cpp" line="217"/>
+ <location filename="../qt-gui.cpp" line="231"/>
<source>ft</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="183"/>
- <location filename="../qt-gui.cpp" line="232"/>
- <location filename="../qt-gui.cpp" line="242"/>
+ <location filename="../qt-gui.cpp" line="240"/>
+ <location filename="../qt-gui.cpp" line="250"/>
<source>lbs</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../dive.c" line="187"/>
- <location filename="../qt-gui.cpp" line="230"/>
- <location filename="../qt-gui.cpp" line="240"/>
+ <location filename="../qt-gui.cpp" line="238"/>
+ <location filename="../qt-gui.cpp" line="248"/>
<source>kg</source>
<translation type="unfinished"></translation>
</message>
@@ -2257,8 +2384,8 @@ Maximum</source>
<location filename="../file.c" line="109"/>
<location filename="../file.c" line="308"/>
<location filename="../file.c" line="310"/>
- <location filename="../file.c" line="390"/>
- <location filename="../file.c" line="392"/>
+ <location filename="../file.c" line="394"/>
+ <location filename="../file.c" line="396"/>
<source>Failed to read '%s'</source>
<translation type="unfinished"></translation>
</message>
@@ -2269,8 +2396,8 @@ Maximum</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../file.c" line="347"/>
- <location filename="../file.c" line="349"/>
+ <location filename="../file.c" line="348"/>
+ <location filename="../file.c" line="350"/>
<source>Maximum number of supported columns on CSV import is %d</source>
<translation type="unfinished"></translation>
</message>
@@ -2602,115 +2729,115 @@ based on GFlow = %.0f and GFhigh = %.0f
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1203"/>
+ <location filename="../profile.c" line="1204"/>
<source>%s
P:%d %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1208"/>
+ <location filename="../profile.c" line="1209"/>
<source>%s
T:%.1f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1215"/>
+ <location filename="../profile.c" line="1216"/>
<source>%s
V:%.2f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1301"/>
+ <location filename="../profile.c" line="1302"/>
<source>%s
Calculated ceiling %.0f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1308"/>
+ <location filename="../profile.c" line="1309"/>
<source>%s
Tissue %.0fmin: %.0f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1255"/>
+ <location filename="../profile.c" line="1256"/>
<source>%s
Safetystop:%umin @ %.0f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1199"/>
+ <location filename="../profile.c" line="1200"/>
<source>@:%d:%02d
D:%.1f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1219"/>
+ <location filename="../profile.c" line="1220"/>
<source>%s
SAC:%2.1fl/min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1258"/>
+ <location filename="../profile.c" line="1259"/>
<source>%s
Safetystop:unkn time @ %.0f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1263"/>
+ <location filename="../profile.c" line="1264"/>
<source>%s
Deco:%umin @ %.0f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1266"/>
+ <location filename="../profile.c" line="1267"/>
<source>%s
Deco:unkn time @ %.0f %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1272"/>
+ <location filename="../profile.c" line="1273"/>
<source>%s
In deco</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1275"/>
+ <location filename="../profile.c" line="1276"/>
<source>%s
NDL:%umin</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1223"/>
+ <location filename="../profile.c" line="1224"/>
<source>%s
CNS:%u%%</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1227"/>
+ <location filename="../profile.c" line="1228"/>
<source>%s
pO%s:%.2fbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1231"/>
+ <location filename="../profile.c" line="1232"/>
<source>%s
pN%s:%.2fbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1235"/>
+ <location filename="../profile.c" line="1236"/>
<source>%s
pHe:%.2fbar</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1240"/>
+ <location filename="../profile.c" line="1241"/>
<source>%s
MOD:%d%s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1247"/>
+ <location filename="../profile.c" line="1248"/>
<source>%s
EAD:%d%s
END:%d%s
@@ -2718,91 +2845,91 @@ EADD:%d%s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1280"/>
+ <location filename="../profile.c" line="1281"/>
<source>%s
Deco:%umin @ %.0f %s (calc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1289"/>
+ <location filename="../profile.c" line="1290"/>
<source>%s
In deco (calc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1292"/>
+ <location filename="../profile.c" line="1293"/>
<source>%s
NDL:%umin (calc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1296"/>
+ <location filename="../profile.c" line="1297"/>
<source>%s
TTS:%umin (calc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1405"/>
+ <location filename="../profile.c" line="1406"/>
<source>%sT: %d:%02d min</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1409"/>
- <location filename="../profile.c" line="1413"/>
- <location filename="../profile.c" line="1417"/>
+ <location filename="../profile.c" line="1410"/>
+ <location filename="../profile.c" line="1414"/>
+ <location filename="../profile.c" line="1418"/>
<source>%s %sD:%.1f%s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1421"/>
+ <location filename="../profile.c" line="1422"/>
<source>%s %sD:%.1f%s
</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1425"/>
+ <location filename="../profile.c" line="1426"/>
<source>%s%sV:%.2f%s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1429"/>
- <location filename="../profile.c" line="1433"/>
+ <location filename="../profile.c" line="1430"/>
+ <location filename="../profile.c" line="1434"/>
<source>%s %sV:%.2f%s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../profile.c" line="1440"/>
+ <location filename="../profile.c" line="1441"/>
<source>%s %sP:%d %s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="283"/>
+ <location filename="../qt-gui.cpp" line="291"/>
<source>C</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="287"/>
+ <location filename="../qt-gui.cpp" line="295"/>
<source>F</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="460"/>
+ <location filename="../qt-gui.cpp" line="469"/>
<source>%1, %2 %3, %4 %5:%6</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="473"/>
+ <location filename="../qt-gui.cpp" line="482"/>
<source>%1 %2, %3
%4:%5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="486"/>
+ <location filename="../qt-gui.cpp" line="495"/>
<source>%1 %2 (%3 dives)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../qt-gui.cpp" line="491"/>
+ <location filename="../qt-gui.cpp" line="500"/>
<source>%1 %2 (1 dive)</source>
<translation type="unfinished"></translation>
</message>
--
cgit v1.2.3-70-g09d2