Latest translations

As usual, only (some of) the changes to the German translations were authored by me. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2013-12-06 13:13:29 -0800
committer: Dirk Hohndel <dirk@hohndel.org> 2013-12-06 13:13:29 -0800
commit: b04666922b9ca9c12007b9d5127a697b78e411b2 (patch)
tree: fa65b1b709f3cd67e5d20642a317c9674d870c7c
parent: 2629e768bd2248a652686589186b50bec51fe044 (diff)
download: subsurface-b04666922b9ca9c12007b9d5127a697b78e411b2.tar.gz
23 files changed, 11354 insertions, 8117 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts
index e16522614..b055f219a 100644
--- a/translations/subsurface_bg_BG.ts
+++ b/translations/subsurface_bg_BG.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Големина</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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>Модел</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Прякор</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"/>
     </message>
@@ -175,12 +175,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"/>
     </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"/>
     </message>
@@ -193,87 +193,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -301,23 +296,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </message>
@@ -405,72 +394,143 @@ 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>№</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>фута</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>паунда</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>макс CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -549,13 +609,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>Бележки</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>Местонахождение</translation>
     </message>
@@ -611,7 +671,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>Бележки</translation>
     </message>
@@ -626,191 +686,188 @@ Please, remove them first.</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Дата</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"/>
     </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"/>
     </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"/>
     </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>SAC</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Време</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Статистики</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Температура:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Общо време</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Гмуркания</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Бутилки</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Запиши</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>И</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>З</translation>
     </message>
@@ -917,7 +974,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"/>
     </message>
@@ -1152,58 +1209,89 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Отвори файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Ръководство за потребителя</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Запиши промените?</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&apos;t save them.</source>
         <translation type="unfinished"/>
     </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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1226,239 +1314,259 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Гмуркания</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Метра</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Фута</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Налягане</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Бара</translation>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
+        <translation>бара</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Литра</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>Кб.Фута</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Температура:</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Целзии</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Фаренхайт</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Филтър</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Тежест</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Налягане</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Температура:</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Тежест</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>паунда</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation type="unfinished"/>
-    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation type="unfinished"/>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1468,32 +1576,37 @@ Please, remove them first.</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1501,12 +1614,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1514,37 +1637,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>Гмуркане №</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Дълбочина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Продълж. (мин.)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Водач</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Партньор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -1708,30 +1831,45 @@ Please, remove them first.</source>
         <translation>Редактирай</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>въздух</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"/>
     </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>Връщане към OC</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> начало</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> край</translation>
@@ -1740,72 +1878,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>неизвестно</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1823,11 +1961,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Затвори</translation>
@@ -1847,6 +1980,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>Максимум</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1915,37 +2053,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>Уеб услуга</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>Свръзване...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Грешка при връзка: </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>Грешен потребителски ключ</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>Не може да бъде напревен разряд!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Успешно изтегляне!</translation>
     </message>
@@ -1961,17 +2104,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>бара</translation>
     </message>
@@ -1979,7 +2122,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"/>
     </message>
@@ -1987,12 +2130,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2025,30 +2168,40 @@ Please, remove them first.</source>
         <translation>Потребителски ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Парола</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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Тежест</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"/>
     </message>
@@ -2056,70 +2209,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>№</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2134,53 +2287,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>бара</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>psi</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>л</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>кб.фута</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>м</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>фута</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>паунда</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>кг</translation>
     </message>
@@ -2229,8 +2382,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 &apos;%s&apos;</source>
         <translation>Не може да бъде прочетен &apos;%s&apos;</translation>
     </message>
@@ -2241,8 +2394,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2588,129 +2741,129 @@ Subsurface планиране
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 таван %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Стоп:%uмин @ %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Стоп:неопр. време @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Деко:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Деко:неопр. време @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 В деко</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fбара</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fбара</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fбара</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2721,91 +2874,91 @@ END:%d%s
 EADD:%d%s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_ca_ES.ts b/translations/subsurface_ca_ES.ts
index d5b2c9d5f..9785c96e7 100644
--- a/translations/subsurface_ca_ES.ts
+++ b/translations/subsurface_ca_ES.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -175,12 +175,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"/>
     </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"/>
     </message>
@@ -193,87 +193,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -301,23 +296,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </message>
@@ -405,72 +394,143 @@ 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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/>
+        <source>Invalid response from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -549,13 +609,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"/>
     </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"/>
     </message>
@@ -611,7 +671,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"/>
     </message>
@@ -626,191 +686,188 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation type="unfinished"/>
     </message>
@@ -917,7 +974,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"/>
     </message>
@@ -1152,58 +1209,89 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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&apos;t save them.</source>
         <translation type="unfinished"/>
     </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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1226,239 +1314,259 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation type="unfinished"/>
-    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation type="unfinished"/>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1468,32 +1576,37 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1501,12 +1614,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1514,37 +1637,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation type="unfinished"/>
     </message>
@@ -1708,30 +1831,45 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -1740,72 +1878,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1823,11 +1961,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation type="unfinished"/>
@@ -1847,6 +1980,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1915,37 +2053,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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -1961,17 +2104,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -1979,7 +2122,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"/>
     </message>
@@ -1987,12 +2130,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation type="unfinished"/>
     </message>
@@ -2025,30 +2168,40 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2056,70 +2209,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2134,53 +2287,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -2229,8 +2382,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 &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
@@ -2241,8 +2394,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2574,115 +2727,115 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2690,91 +2843,91 @@ EADD:%d%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts
index 19cdfb272..f3433c3fb 100644
--- a/translations/subsurface_da_DK.ts
+++ b/translations/subsurface_da_DK.ts
@@ -62,12 +62,12 @@
         <translation>For konfigurerede imports</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>Åben CSV log fil</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>CSV filer (*.csv)</translation>
     </message>
@@ -75,57 +75,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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>ArbejdsTryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>StartTryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>SlutTryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Skift på</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik vil fjerne flasken</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>Flasken kan ikke fjernes</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>Denne flaske er i brug. Kun flasker som ikke er i brug kan slettes</translation>
     </message>
@@ -153,22 +153,22 @@ fjerne den valgte dykkercomputer?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Enheds ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Kaldenavn</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>Klik her, vil fjerne denne dykkercomputer</translation>
     </message>
@@ -176,12 +176,12 @@ fjerne den valgte dykkercomputer?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,82 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>Vis søgebox</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Sigt:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>Vis alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>Skjul alt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>Saml andre</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>Fjern dyk fra tur</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>Lav ny tur over</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>Tilføj dyk til tur umiddelbart over</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>Flet tur med tur over</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>Flet tur med tur under</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>Slet dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Gem som</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>Exporter som UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>Skift tider</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>Gem dyk som...</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>Gem fil som</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>UDDF filer (*.uddf *.UDDF)</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>Flet valgte dyk</translation>
     </message>
@@ -302,23 +297,17 @@ fjerne den valgte dykkercomputer?</translation>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Sidste stop på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Start tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>ATM Tryk</translation>
     </message>
@@ -407,72 +396,143 @@ slet dem venligst først.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>fod</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>Dragt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>Flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>Position</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>MaxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ slet dem venligst først.</translation>
     <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>Dyk notater</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>Position</translation>
     </message>
@@ -613,7 +673,7 @@ slet dem venligst først.</translation>
     </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>Noter</translation>
     </message>
@@ -628,191 +688,188 @@ slet dem venligst først.</translation>
         <translation>Dyk info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Anvendte gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Forbrugt Gas</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Gns. dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Lufttryk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Luft temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Vand temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dykker Tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Saltindhold</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Flasker </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Tilføj flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Vægt</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>Tilføj vægt system</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Tur position</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>Tur noter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Fortryd</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>Denne tur er ved at blive editeret</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>Flere dyk bliver editeret</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>Dette dyk bliver editeret</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -919,7 +976,7 @@ slet dem venligst først.</translation>
     <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>Importer filer</translation>
     </message>
@@ -1154,84 +1211,89 @@ slet dem venligst først.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Åben fil</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>Gem eller Fortryd venligst denne rettelse før du lukker filen</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>Gem eller fortryd venligst dette dyk før du laver en dykkerplan</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>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Brugermanual</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan ikke finde Subsurface manualen</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>Vil du gemme ændringerne du lavede i %1?</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>Vil du gemme ændringerne du lavede i datafilen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Gem ændringer?</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&apos;t save them.</source>
         <translation>Ændringer vil blive tabt hvis du ikke gemmer dem.</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>Færdiggør først dette dyk før du laver et nyt</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>Gem fil som</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>Advarsel</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>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</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>UDDF filer (*.uddf *.UDDF)</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1254,239 +1316,259 @@ slet dem venligst først.</translation>
         <translation>Graf</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Lister og tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Font størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Dyk</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>Standard fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Ugyldig visning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Standard flaske</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>Brug standard flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personliggør</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Fod</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Tryk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liter</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>CuFt</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Vægt</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Tryk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Vægt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
-        <translation>pund (lbs)</translation>
+        <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Tids enheder</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>Fælles nævner for op/nedstignings hastighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>Tærskel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Dykkercomputer rapporteret loft</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>Tegn loft rød</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Beregnet loft</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>Vis alle vævstyper</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3m step</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>Beregn NDL/TTS</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>GFLav på max dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Blandet</translation>
     </message>
@@ -1496,32 +1578,37 @@ slet dem venligst først.</translation>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>Max PP02</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHøj</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Åben standard log fil</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1529,12 +1616,22 @@ slet dem venligst først.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Udskriv:</translation>
     </message>
@@ -1542,37 +1639,37 @@ slet dem venligst først.</translation>
 <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>Dyk nr:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Varighed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Makker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -1736,30 +1833,45 @@ slet dem venligst først.</translation>
         <translation>Rediger</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>luft</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>EAN%1</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>Bailing out to OC</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>start</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>slut</translation>
@@ -1768,72 +1880,72 @@ slet dem venligst først.</translation>
 <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>Ukendt</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>Dyk #%1 - %2</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>Max dybde: %1 %2</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>Varighed: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gas brugt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Vægt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Noter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Dragt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Sigt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -1851,11 +1963,6 @@ slet dem venligst først.</translation>
         <translation>Fjern dette punkt</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>Ingen positions data - flyt kortet og dobbelt-klik for at vælge position</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Luk</translation>
@@ -1875,6 +1982,11 @@ slet dem venligst først.</translation>
         <source>Maximum</source>
         <translation>Maksimal</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ slet dem venligst først.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Vent lidt indtil vi har noget ....</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Forbinder...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Download færdige</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Forbindelses fejl:</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>Ugyldig bruger navn</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>Kan ikke fortolke svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Download succes!</translation>
     </message>
@@ -1989,17 +2106,17 @@ slet dem venligst først.</translation>
 <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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2007,7 +2124,7 @@ slet dem venligst først.</translation>
 <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>Information</translation>
     </message>
@@ -2015,12 +2132,12 @@ slet dem venligst først.</translation>
 <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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2053,30 +2170,40 @@ slet dem venligst først.</translation>
         <translation>Bruger ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Upload</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Vægt</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>Klik her, vil fjerne dette vægtsystem</translation>
     </message>
@@ -2084,79 +2211,79 @@ slet dem venligst først.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt;Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Varighed
 Ialt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Gennemsnit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Længst</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>Dybde (%1)
 Gennemsnit</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>
 Minimum</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>
 Maximum</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>SAC (%1)
 Gennemsnit</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>Temp. (%1)
@@ -2172,53 +2299,53 @@ Gennemsnit</translation>
     </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>bar</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>psi</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>l</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>cuft</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>m</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>fod</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>pund (lbs)</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>kg</translation>
     </message>
@@ -2267,8 +2394,8 @@ Gennemsnit</translation>
         <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 &apos;%s&apos;</source>
         <translation>Fejl i læsning af &apos;%s&apos;</translation>
     </message>
@@ -2279,8 +2406,8 @@ Gennemsnit</translation>
         <translation>Kunne ikke læse &apos;%s&apos;. Brug omport for CSV filer.</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>Maximum antal of kolonner i CSV import er %d</translation>
     </message>
@@ -2627,133 +2754,133 @@ baseret på GFlow = %.0f og GFhigh = %.0f⏎
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s⏎
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s⏎
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s⏎
 Beregnet loft %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Væv %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s⏎
 Sikkerhedsstop:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
  D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s⏎
 Sikkerhedsstop:Ukendt tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s⏎
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s⏎
 Deko:unkn time @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s⏎
 In deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s⏎
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s⏎
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s⏎
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s⏎
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s⏎
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s⏎
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2764,98 +2891,98 @@ END:%d%s⏎
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deko:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 I Deko (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (beregn)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s
 </translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
  %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts
index 7c45b559a..1f814f6cc 100644
--- a/translations/subsurface_de_CH.ts
+++ b/translations/subsurface_de_CH.ts
@@ -62,12 +62,12 @@
         <translation>Vorkonfigurierte Importe</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>CSV Log Datei öffnen</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>CSV Dateien (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Grösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>max. Fülldruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Druck vorh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Druck nachh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O₂%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Wechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</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>Flasche kann nicht entfernt werden</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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
     </message>
@@ -152,22 +152,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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Gerätename</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>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -175,12 +175,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> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -193,87 +193,82 @@
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Sichtbar:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>Tauchgäng(e) zum Trip darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>Reise mit der Reise darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>Reise mit der Reise darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
@@ -301,23 +296,17 @@
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Oberflächendruck</translation>
     </message>
@@ -406,72 +395,143 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>max. CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -550,13 +610,13 @@ Bitte entferne diese zuerst.</translation>
     <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>Notizen</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>Ort</translation>
     </message>
@@ -612,7 +672,7 @@ Bitte entferne diese zuerst.</translation>
     </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>Notizen</translation>
     </message>
@@ -627,191 +687,188 @@ Bitte entferne diese zuerst.</translation>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Gewichte</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>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Reise Ort</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>Reise Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Abbrechen</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>Diese Reise wird bearbeitet.</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>Mehrere Tauchgänge werden bearbeitet.</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>Dieser Tauchgang wird bearbeitet.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -918,7 +975,7 @@ Bitte entferne diese zuerst.</translation>
     <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>Dateien importieren</translation>
     </message>
@@ -1153,58 +1210,89 @@ Bitte entferne diese zuerst.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Benutzerhandbuch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kann das Subsurface Handbuch nicht finden</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>Möchtest Du die Änderungen in der Datei %1 speichern?</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>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Änderungen speichern?</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&apos;t save them.</source>
         <translation>Änderungen gehen verloren wenn Du sie nicht speicherst.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Datei speichern als</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>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1227,239 +1315,259 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diagramm</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listen und Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Schriftgrösse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Tauchgänge</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>Standard Tauch Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Anzeige ungültig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Standard Flasche</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>Benutze Standard Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalisiert</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Fuss</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Druck</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liter</translation>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>cuft</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</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>Zeiteinheit für Geschwindigkeit bei Abstieg/Aufstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO₂</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>Schwelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Auftauchgrenze Tauchcomputer</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>tiefster Deko-Stopp rot markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Berechnete Auftauchgrenze</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>alle Gewebe anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3m Inkremente</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>Null-/Auftauchzeit berechnen</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>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
@@ -1469,32 +1577,37 @@ Bitte entferne diese zuerst.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max. PPO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GF high</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Standard Logfile öffnen</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1502,12 +1615,22 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Drucken</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -1515,37 +1638,37 @@ Bitte entferne diese zuerst.</translation>
 <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>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Guide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -1709,30 +1832,45 @@ Bitte entferne diese zuerst.</translation>
         <translation>Bearbeiten</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>Luft</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>EAN%1</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>Notausstieg mit offenem System</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> Anfang</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> Ende</translation>
@@ -1741,72 +1879,72 @@ Bitte entferne diese zuerst.</translation>
 <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>unbekannt</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>Tauchgang Nr %1 - %2</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>max Tiefe: %1 %2</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>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Gewichte:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -1824,11 +1962,6 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Keine Positionsdaten - Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Schliessen</translation>
@@ -1848,6 +1981,11 @@ Bitte entferne diese zuerst.</translation>
         <source>Maximum</source>
         <translation>Max.</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1916,37 +2054,42 @@ Bitte entferne diese zuerst.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Warten Sie ein bisschen, bis wir etwas haben ...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Verbinde...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Download beendet</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Verbindungsfehler: </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>Ungültige Benutzerkennung</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>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
@@ -1962,17 +2105,17 @@ Bitte entferne diese zuerst.</translation>
 <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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1980,7 +2123,7 @@ Bitte entferne diese zuerst.</translation>
 <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>Information</translation>
     </message>
@@ -1988,12 +2131,12 @@ Bitte entferne diese zuerst.</translation>
 <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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2026,30 +2169,40 @@ Bitte entferne diese zuerst.</translation>
         <translation>Benutzer-Kennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Hochladen</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Gewicht</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>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -2057,79 +2210,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Längster</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>Tiefe (%1)
  Durchschnitt</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>
 Minimum</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>
 Maximum</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>SAC (%1)
  Durchschnitt</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>Temp. (%1)
@@ -2145,53 +2298,53 @@ Mittel</translation>
     </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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>US Pfund</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>kg</translation>
     </message>
@@ -2240,8 +2393,8 @@ Mittel</translation>
         <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 &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
@@ -2252,8 +2405,8 @@ Mittel</translation>
         <translation>&apos;%s&apos; lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</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>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
@@ -2599,133 +2752,133 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 D:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Berechneter tiefster Deko-Stopp %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Gewebe %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Sicherheitsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 Tiefe:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 In Deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2736,97 +2889,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deko:%umin @ %.0f %s (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 Deko (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 Nullzeit:%umin (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 Auftauchzeit:%umin (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts
index 9ef247384..71de37503 100644
--- a/translations/subsurface_de_DE.ts
+++ b/translations/subsurface_de_DE.ts
@@ -62,12 +62,12 @@
         <translation>Vorkonfigurierte Importe</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>CSV Log Datei öffnen</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>CSV Dateien (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>max. Fülldruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Druck vorh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Druck nachh.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O₂%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Wechsel bei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Hier klicken entfernt diese Flasche.</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>Flasche kann nicht entfernt werden</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>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation>
     </message>
@@ -152,22 +152,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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Gerätebezeichnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Gerätename</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>Hier klicken entfernt diesen Tauchcomputer.</translation>
     </message>
@@ -175,12 +175,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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -193,87 +193,82 @@
         <translation>Suchfeld anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Sichtbar:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>Alle ausklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>Alle einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>Andere einklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>Entferne Tauchgang aus Reise</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>Neue Reise darüber einfügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>Tauchgäng(e) zum Trip darüber hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>Reise mit der Reise darüber verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>Reise mit der Reise darunter verbinden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>Tauchgang löschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Speichern unter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exportieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>Zeiten verschieben</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Speichere Tauchgänge als...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Datei speichern als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>Ausgewählte Tauchgänge zusammenführen</translation>
     </message>
@@ -301,23 +296,17 @@
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Letzter Stopp auf 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Startzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Oberflächendruck</translation>
     </message>
@@ -406,72 +395,145 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>Anzug</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>Flasche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>Tauchplatz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>max. CNS</translation>
     </message>
 </context>
 <context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/>
+        <source>Invalid response from server</source>
+        <translation>Ungültige Serverantwort</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation>%1 anstelle des erwarteten XML Tags &apos;DiveDateReader&apos;.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation>XML Tag &apos;DiveDates&apos; nicht gefunden.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation>Ungültige XML Antwort. Zeile %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation>Übertrage Liste der Tauchgänge</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation>Liste der Tauchgänge herunterladen...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation>Lade %1 Tauchgänge vom Server...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation>Herunterladen beendet - %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <source>Corrupted download</source>
+        <translation>Heruntergeladene Daten sind beschädigt.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation>Das Archiv konnte nicht geöffnet werden
+%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation>Das Archiv entält beschädigte Daten
+%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation>Übertragung beendet</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation>Fehler beim Herunterladen: %1</translation>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -550,13 +612,13 @@ Bitte entferne diese zuerst.</translation>
     <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>Notizen</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>Ort</translation>
     </message>
@@ -612,7 +674,7 @@ Bitte entferne diese zuerst.</translation>
     </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>Notizen</translation>
     </message>
@@ -627,191 +689,188 @@ Bitte entferne diese zuerst.</translation>
         <translation>Informationen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Oberflächenpause</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Verw. Gase</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Verbrauchtes Gas</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>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max. Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Ø Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Luftdruck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Wassertemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salzgehalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Gesamtzeit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Tauchgänge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Flaschen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Flasche hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Blei</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>Gewichtsystem hinzufügen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Reise Ort</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>Reise Notizen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Abbrechen</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>Diese Reise wird bearbeitet.</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>Mehrere Tauchgänge werden bearbeitet.</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>Dieser Tauchgang wird bearbeitet.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>unbekannt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -918,7 +977,7 @@ Bitte entferne diese zuerst.</translation>
     <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>Dateien importieren</translation>
     </message>
@@ -1153,58 +1212,89 @@ Bitte entferne diese zuerst.</translation>
         <translation>Strg+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor das Logbuch geschlossen werden kann.</translation>
+    </message>
+    <message>
+        <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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchplan bearbeitet werden kann.</translation>
+    </message>
+    <message>
+        <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>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Benutzerhandbuch</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kann das Subsurface Handbuch nicht finden</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>Möchtest Du die Änderungen in der Datei %1 speichern?</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>Möchtest Du die Änderungen in der Daten-Datei speichern?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Änderungen speichern?</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&apos;t save them.</source>
         <translation>Änderungen gehen verloren wenn Du sie nicht speicherst.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein anderer Tauchgang bearbeitet werden kann.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Datei speichern als</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>Warnung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neues Logbuch geöffnet werden kann.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF Dateien (*.uddf *.UDDF)</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1227,239 +1317,259 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diagramm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation>Sprache</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listen und Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Schriftart</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Schriftgröße</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Tauchgänge</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>Standard Tauch Datei</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Zeige auch ungültige?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Standardflasche</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>Wähle Deine Standardflasche(n)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Zöllig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalisieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Fuß</translation>
+        <source>meter</source>
+        <translation>Meter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Druck</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>bar</translation>
+        <source>feet</source>
+        <translation>Fuß</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liter</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>cuft</translation>
+        <source>liter</source>
+        <translation>Liter</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
+        <source>cu ft</source>
+        <translation>cu ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
         <translation>Celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
         <translation>Fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation>Standardeinstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Druck</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>US Pfund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Zeiteinheiten</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>Zeiteinheit für Geschwindigkeit bei Abstieg/Aufstieg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekunden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO₂</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>Schwelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation>max ppO₂</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>EAD END EADD</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>Auftauchgrenze Tauchcomputer</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>tiefster Deko-Stopp rot markieren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Berechnete Auftauchgrenze</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>alle Gewebe anzeigen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3m Stufen</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>Null-/Auftauchzeit berechnen</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>GF low bei maximaler Tiefe anwenden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Sonstiges</translation>
     </message>
@@ -1469,32 +1579,37 @@ Bitte entferne diese zuerst.</translation>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max. PPO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>AMV</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GF low</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GF high</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="187"/>
+        <location filename="../qt-ui/preferences.cpp" line="193"/>
+        <source>Restart required</source>
+        <translation>Bitte Programm neu starten</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="194"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation>Um die neue Sprache laden zu können, muss Subsurface neu gestartet werden.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Standard Logfile öffnen</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>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1502,12 +1617,22 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Drucken</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation>Vorschau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation>Drucken</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Drucken</translation>
     </message>
@@ -1515,37 +1640,37 @@ Bitte entferne diese zuerst.</translation>
 <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>Tauchgang Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Tiefe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Dauer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Leiter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
@@ -1709,30 +1834,45 @@ Bitte entferne diese zuerst.</translation>
         <translation>Bearbeiten</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>PN₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation>PHe</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>Luft</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>EAN%1</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>Notausstieg mit offenem System</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> Anfang</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> Ende</translation>
@@ -1741,72 +1881,72 @@ Bitte entferne diese zuerst.</translation>
 <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>unbekannt</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>Tauchgang Nr %1 - %2</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>max Tiefe: %1 %2</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>Dauer: %1 Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Verw. Gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>AMV:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Blei:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notizen:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Tauchgruppenleiter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Anzug:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Sicht:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Bewertung:</translation>
     </message>
@@ -1824,11 +1964,6 @@ Bitte entferne diese zuerst.</translation>
         <translation>Diesen Punkt entfernen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Keine Positionsdaten - Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Schließen</translation>
@@ -1848,6 +1983,11 @@ Bitte entferne diese zuerst.</translation>
         <source>Maximum</source>
         <translation>Max.</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>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1900,7 +2040,7 @@ Bitte entferne diese zuerst.</translation>
     <message>
         <location filename="../qt-ui/about.cpp" line="19"/>
         <source>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-platform divelog software&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013&lt;/span&gt;</source>
-        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-Platform Program zur Verwaltung von Taucher-Logbucheinträgen&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, und andere, 2011, 2012, 2013&lt;/span&gt;</translation>
+        <translation>&lt;span style=&apos;font-size: 18pt; font-weight: bold;&apos;&gt;Subsurface %1 &lt;/span&gt;&lt;br&gt;&lt;br&gt;Multi-Plattform Programm zur Verwaltung von Taucher-Logbucheinträgen&lt;br&gt;&lt;span style=&apos;font-size: 8pt&apos;&gt;Linus Torvalds, Dirk Hohndel, und andere, 2011, 2012, 2013&lt;/span&gt;</translation>
     </message>
     <message>
         <location filename="../qt-ui/about.cpp" line="23"/>
@@ -1916,37 +2056,42 @@ Bitte entferne diese zuerst.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Warten Sie ein bisschen, bis wir etwas haben ...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Verbinde...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Download beendet</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation>Herunterladen beendet</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>Fehler beim Herunterladen: %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Verbindungsfehler: </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>Ungültige Benutzerkennung</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>Verstehe die Antwort nicht!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Erfolgreich geladen!</translation>
     </message>
@@ -1962,17 +2107,17 @@ Bitte entferne diese zuerst.</translation>
 <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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1980,7 +2125,7 @@ Bitte entferne diese zuerst.</translation>
 <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>Information</translation>
     </message>
@@ -1988,12 +2133,12 @@ Bitte entferne diese zuerst.</translation>
 <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>Beschreibung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2026,30 +2171,40 @@ Bitte entferne diese zuerst.</translation>
         <translation>Benutzer-Kennung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Hochladen</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation>Die Aktion hat zu lange gedauert</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation>Übertrage Daten...</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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Gewicht</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>Hier klicken entfernt dieses Gewichtssystem.</translation>
     </message>
@@ -2057,79 +2212,79 @@ Bitte entferne diese zuerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jahr 
  &gt; Monat / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Dauer
 Gesamt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Kürzester</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Längster</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>Tiefe (%1)
  Durchschnitt</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>
 Minimum</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>
 Maximum</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>AMV (%1)
  Durchschnitt</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>Temp. (%1)
@@ -2145,53 +2300,53 @@ Mittel</translation>
     </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>bar</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>psi</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>l</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>cu.ft.</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>m</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>ft</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>US Pfund</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>kg</translation>
     </message>
@@ -2240,8 +2395,8 @@ Mittel</translation>
         <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 &apos;%s&apos;</source>
         <translation>Fehler beim Lesen von &apos;%s&apos;</translation>
     </message>
@@ -2252,8 +2407,8 @@ Mittel</translation>
         <translation>&apos;%s&apos; lesen fehlgeschlagen. Benutze Importieren für CSV Dateien.</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>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation>
     </message>
@@ -2599,133 +2754,133 @@ basierend auf GFlow = %.0f und GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 D:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Berechneter tiefster Deko-Stopp %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Gewebe %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Sicherheitsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 Tiefe:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 AMV:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Sicherheitsstopp:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko:unbk Zeit @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 In Deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2736,97 +2891,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deko:%umin @ %.0f %s (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 Deko (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 Nullzeit:%umin (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 Auftauchzeit:%umin (berechnet)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sTiefe:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sTiefe:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sDruck:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 Tauchgänge)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 Tauchgang)</translation>
     </message>
diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts
index 07a40eb60..7562009f9 100644
--- a/translations/subsurface_es_ES.ts
+++ b/translations/subsurface_es_ES.ts
@@ -62,12 +62,12 @@
         <translation>Importaciones pre-configuradas</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>Abrir archivo CSV</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>Archivos CSV (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Pres. trabajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Pres. inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Pres. final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Cambiar a </translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Pulsar aquí borrará esta botella</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>La botella no puede borrarse</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>Gas en uso. Solo  pueden borrarse botellas que no se usan en la inmersión.</translation>
     </message>
@@ -153,22 +153,22 @@ ordenador seleccionado ?</translation>
 <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>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>ID del dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Nombre</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>Pulsar aquí borrará este ordenador de buceo.</translation>
     </message>
@@ -176,12 +176,12 @@ ordenador seleccionado ?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>Pie³/min</translation>
     </message>
@@ -194,87 +194,82 @@ ordenador seleccionado ?</translation>
         <translation>Mostrar ventana de busqueda</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Visible:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>Expandir todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>Encoger todo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>Encoger otros</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>Borrar inmersión(es) del viaje</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>Crear nuevo viaje arriba</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>Añadir inmersión(es) al viaje de arriba</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>mezclar viaje con el viaje de arriba</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>mezclar viaje con el viaje de abajo</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>Borrar inmersión(es)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Guardar como</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>Exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>Desplazar horas</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>Guardar las inmersiones como ...</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>Guardar archivo como</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>Archivos UDDF (*.uddf *.UDDF)</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>Mezclar las inmersiones seleccionadas</translation>
     </message>
@@ -302,23 +297,17 @@ ordenador seleccionado ?</translation>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Última parada a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Hora de inicio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Presión atmosférica</translation>
     </message>
@@ -407,72 +396,143 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>traje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>bot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>Ubicación</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ Por favor, bórralas antes.</translation>
     <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>Notas de la inmersión</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>Ubicación</translation>
     </message>
@@ -613,7 +673,7 @@ Por favor, bórralas antes.</translation>
     </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>Notas</translation>
     </message>
@@ -628,191 +688,188 @@ Por favor, bórralas antes.</translation>
         <translation>Información de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gas consumido</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>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Profundidad máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Profundidad media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Presión atmosférica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Temperatura del aire</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Temperatura del agua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Duración de la inmersión</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salinidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Estadísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Tiempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Inmersiones</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Botellas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Añadir botella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Lastre</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>Añadir sistema de lastre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Ubicación del viaje</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>Notas del viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Cancelar</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>Este viaje está siendo editado.</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>Se están editando varias inmersiones.</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>Esta inmersión esta siendo editada.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>desconocido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -919,7 +976,7 @@ Por favor, bórralas antes.</translation>
     <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>Importar Archivos</translation>
     </message>
@@ -1154,84 +1211,89 @@ Por favor, bórralas antes.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Abrir archivo</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>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</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>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar planificar otra.</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>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Manual de usuario</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>No puedo encontrar el manual de Subsurface</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>¿ Quieres guardar los cambios que has hecho en el archivo %1 ?</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>¿ Quieres guardar los cambios que has hecho en el archivo de datos ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>¿Guardar los cambios?</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&apos;t save them.</source>
         <translation>Los cambios se perderán si no los guardas</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>Termina primero la edición actual antes de intentar editar otra.</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>Guardar archivo como</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>Advertencia</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>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</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>Archivos UDDF (*.uddf *.UDDF)</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>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1254,239 +1316,259 @@ Por favor, bórralas antes.</translation>
         <translation>Gráfico</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listas y tablas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Fuente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Tamaño de fuente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Inmersiones</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>Archivo de inmersiones por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Mostrar no validas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Botella por defecto</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>Usar botella por defecto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Metro</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Pies</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Presión</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volumen</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litro</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>pie³</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filtros</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Presión</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volumen</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Unidades de tiempo</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>Denominador de la velocidad de ascenso/descenso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>umbral</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>PMO</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>PEA PNE EADD</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>Techo informado por el ordenador</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>Dibujar el techo en rojo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Techo calculado</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>Mostrar todos los tejidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>Incrementos de 3m</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>Calcular NDL/TTS</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>GF bajo a la máxima profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
@@ -1496,32 +1578,37 @@ Por favor, bórralas antes.</translation>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GF bajo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GF alto</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Abrir archivo de registro por defecto</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>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1529,12 +1616,22 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>Im&amp;primir</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -1542,37 +1639,37 @@ Por favor, bórralas antes.</translation>
 <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>Inmersión n.º</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Profundidad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Duración</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Guía</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Compañero</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Ubicación</translation>
     </message>
@@ -1736,30 +1833,45 @@ Por favor, bórralas antes.</translation>
         <translation>Editar</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>aire</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>EAN%1</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>Cambio de emergencia a OC</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>comienzo</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>fin</translation>
@@ -1768,72 +1880,72 @@ Por favor, bórralas antes.</translation>
 <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>desconocido</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>Inmersión #%1 - %2</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>Profundidad máxima: %1 %2</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>Duración: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gas usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Lastre:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Compañero:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Traje:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Visibilidad:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Calificación:</translation>
     </message>
@@ -1851,11 +1963,6 @@ Por favor, bórralas antes.</translation>
         <translation>Borrar este punto</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>No hay datos de posición - Mueve el mapa y haz doble clic para fijar la posición de la inmersión</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Cerrar</translation>
@@ -1875,6 +1982,11 @@ Por favor, bórralas antes.</translation>
         <source>Maximum</source>
         <translation>Máxima</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ Por favor, bórralas antes.</translation>
 <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>Servicio web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Espera un momento a que tengamos algo ...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Conectando…</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Descarga terminada</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Error de conexión:</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>El identificador de usuario no es válido.</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>No se puede analizar la respuesta.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Se ha completado la descarga correctamente.</translation>
     </message>
@@ -1989,17 +2106,17 @@ Por favor, bórralas antes.</translation>
 <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>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2007,7 +2124,7 @@ Por favor, bórralas antes.</translation>
 <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>Información</translation>
     </message>
@@ -2015,12 +2132,12 @@ Por favor, bórralas antes.</translation>
 <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>Descripción</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2053,30 +2170,40 @@ Por favor, bórralas antes.</translation>
         <translation>ID del usuario</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Subir</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</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>Pulsar aquí borrará este sistema de lastre.</translation>
     </message>
@@ -2084,79 +2211,79 @@ Por favor, bórralas antes.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Año
 &gt; Mes / Viaje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Duración
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Más corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Más larga</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>Profundidad (%1)
 Media</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>
 Mínimo</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>
 Máximo</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>CAS (%1)
 Medio</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>Temp. (%1)
@@ -2172,53 +2299,53 @@ Media</translation>
     </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>bar</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>psi</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>l</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>pie³</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2267,8 +2394,8 @@ Media</translation>
         <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 &apos;%s&apos;</source>
         <translation>No se pudo leer «%s»</translation>
     </message>
@@ -2279,8 +2406,8 @@ Media</translation>
         <translation>Falló al leer &apos;%s&apos;. Usa &quot;Importar&quot; para archivos CSV.</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>El máximo número de columnas que soporta importar CSV es %d</translation>
     </message>
@@ -2626,133 +2753,133 @@ basado en GFbajo = %.0f  y  GFalto = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 Pres:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Techo calculado %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Tejido %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Parada de seguridad:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 Prof:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 CAS:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Parada de seguridad:tiempo desconocido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:Tiempo desconocido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 En deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2763,97 +2890,97 @@ PNE:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deco:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 En deco (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sPres:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 inmersiones)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 inmersión)</translation>
     </message>
diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts
index 82d2ad273..ef3236e8f 100644
--- a/translations/subsurface_et_EE.ts
+++ b/translations/subsurface_et_EE.ts
@@ -62,12 +62,12 @@
         <translation>Eelseadistatud impordid</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>Ava CSV logifail</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>CSV failid (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Töörõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Algusrõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Lõpurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Vaheta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Siin klikkamine eemaldab selle ballooni</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>Ballooni ei saa eemaldada</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>See gaas on kasutusel. Eemaldada saab ainult neid balloone mida ei kasutata sellel sukeldumisel.</translation>
     </message>
@@ -153,22 +153,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>Mudel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Seadme ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Hüüdnimi</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>Siin klikkamine eemaldab selle kompuutri.</translation>
     </message>
@@ -176,12 +176,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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>kuupjalga/min</translation>
     </message>
@@ -194,87 +194,82 @@
         <translation>Näita otsinguakent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Nähtav:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>laienda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>ahenda kõik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>ahenda muud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>kõrvalda sukeldumine/sukeldumised väljasõidust</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>loo uus väljasõit ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>lisa sukeldumine/sukeldumised väljasõitu kohe eespool </translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>ühenda väljasõit väljasõiduga ülal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>ühenda väljasõit väljasõiduga all</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>kustuta sukeldumine/sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>salvesta nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>ekspordi UDDF kujul</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>nihuta ajad</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Salvesta sukeldumised nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Salvesta fail nimega</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF failid (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>ühenda valitud sukeldumised</translation>
     </message>
@@ -302,23 +297,17 @@
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Viimane peatus 6m peal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Algusaeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>ATM rõhk</translation>
     </message>
@@ -407,72 +396,143 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>jalg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>ülikond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>ball</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>asukoht</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ palun eemalda need esmalt.</translation>
     <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>Sukeldumise märkmed</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>Asukoht</translation>
     </message>
@@ -613,7 +673,7 @@ palun eemalda need esmalt.</translation>
     </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>Märkmed</translation>
     </message>
@@ -628,191 +688,188 @@ palun eemalda need esmalt.</translation>
         <translation>Sukeldumise info</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Kasutatud gaasid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Tarbitud gaas</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Keskm sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>Hapnikumürgistuse ühik (OTU)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Õhurõhk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Õhu temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Vee temp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Sukeldumise aeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Soolsus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Koguaeg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Sukeldumised</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Balloonid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Lisa balloon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Raskused</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>Lisa raskuste süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Väljasõidu koht</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>Väljasõidu märkmed</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Salvesta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Loobu</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>Seda väljasõitu toimetatakse</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>Mitut sukeldumist toimetatakse</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>Seda sukeldumist toimetatakse.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>tundmatu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -919,7 +976,7 @@ palun eemalda need esmalt.</translation>
     <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>Impordi failid</translation>
     </message>
@@ -1154,58 +1211,89 @@ palun eemalda need esmalt.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Ava fail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
+    </message>
+    <message>
+        <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>Enne sukeldumise planeerimist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
+    </message>
+    <message>
+        <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>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Kasutusjuhend</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Ei leia Subsurface juhendit</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>Soovid tehtud muudatused salvestada faili %1?</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>Soovid tehtud muudatused salvestada andmefaili?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Salvesta muudatused?</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&apos;t save them.</source>
         <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation>Sulge käesolev toimetamine ja alles siis alusta järgmist.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Salvesta nimega</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>Hoiatus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF files (*.uddf *.UDDF)</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>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1228,239 +1316,259 @@ palun eemalda need esmalt.</translation>
         <translation>Graaf</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listid ja tabelid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Kirjatüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Kirjatüübi suurus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Sukeldumised</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>Sukeldumiste vaikefail</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Kuva ebaõnnestunud</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Vaikimisi balloon</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>Kasuta vaikimisi ballooni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Süsteem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>SI</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Briti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Isikupärasta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Meeter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Jalg</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Rõhk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Maht</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liiter</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>kuupjalg</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatuur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Raskus</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Rõhk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Maht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Raskus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>nael</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Aja ühikud</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>Laskumise/Tõusu kiiruse kordaja</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekundid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Näita</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>lävi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHE</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Kompuutri teatatud lagi</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>joonista lagi punasena</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Arvutatud lagi</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>näita kõiki kudesid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3m samm</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>Arvuta NDL/TTS</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>GFlow max sügavusel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Muu</translation>
     </message>
@@ -1470,32 +1578,37 @@ palun eemalda need esmalt.</translation>
         <translation>Eelistused</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Ava vaike logifail</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>Subsurface XML failid (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1503,12 +1616,22 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Väljund</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Väljastus</translation>
     </message>
@@ -1516,37 +1639,37 @@ palun eemalda need esmalt.</translation>
 <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>Sukeldumise nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Kuupäev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Sügavus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Kestus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Semu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Asukoht</translation>
     </message>
@@ -1710,30 +1833,45 @@ palun eemalda need esmalt.</translation>
         <translation>Toimeta</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>õhk</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>EAN%1</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>Üleminek avatud süsteemile</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> algus</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> lõpp</translation>
@@ -1742,72 +1880,72 @@ palun eemalda need esmalt.</translation>
 <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>tundmatu</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>Sukeldumine #%1 - %2</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>Max sügavus: %1 %2</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>Kestus: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Kasutatud gaas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Raskused:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Märkmed:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Semu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Ülikond:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Nähtavus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Hinne:</translation>
     </message>
@@ -1825,11 +1963,6 @@ palun eemalda need esmalt.</translation>
         <translation>Eemalda see punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Ei ole asukoha andmeid - liigu kaardil ja määra topeltklikiga sukeldumise asukoht</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Sulge</translation>
@@ -1849,6 +1982,11 @@ palun eemalda need esmalt.</translation>
         <source>Maximum</source>
         <translation>Maksimum</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1917,37 +2055,42 @@ palun eemalda need esmalt.</translation>
 <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>Veebiteenus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Oota natuke kuni meil on midagi...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Ühendab...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Allalaadimine lõppenud</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Viga ühendamisel:</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>Vale kasutaja ID!</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>Ei suuda vastust tuvastada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Allalaadimine õnnestus!</translation>
     </message>
@@ -1963,17 +2106,17 @@ palun eemalda need esmalt.</translation>
 <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>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1981,7 +2124,7 @@ palun eemalda need esmalt.</translation>
 <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>Info</translation>
     </message>
@@ -1989,12 +2132,12 @@ palun eemalda need esmalt.</translation>
 <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>Kirjeldus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,30 +2170,40 @@ palun eemalda need esmalt.</translation>
         <translation>Kasutaja ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Salasõna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Üleslaadimine</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Tüüp</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Raskus</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>Siin klikkamine kõrvaldab selle raskuste süsteemi</translation>
     </message>
@@ -2058,79 +2211,79 @@ palun eemalda need esmalt.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Aasta
  &gt; Kuu / väljasõit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Kestus
 kokku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Keskmine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Lühim</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Pikim</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>Sügavus (%1)
 keskmine</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>
 Miinimum</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>
 Maksimum</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>SAC (%1)
  keskmine</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>Temp. (%1)
@@ -2146,53 +2299,53 @@ Maksimum</translation>
     </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>bar</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>psi</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>l</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>kuupjalg</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>m</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>jalg</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>nael</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>kg</translation>
     </message>
@@ -2241,8 +2394,8 @@ Maksimum</translation>
         <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 &apos;%s&apos;</source>
         <translation>&apos;%s&apos; lugemine ebaõnnestus</translation>
     </message>
@@ -2253,8 +2406,8 @@ Maksimum</translation>
         <translation>&apos;%s&apos; lugemine ebaõnnestus. Kasuta CSV failide importi.</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>CSV impordil on max toetatud veergude arv %d</translation>
     </message>
@@ -2600,130 +2753,130 @@ põhineb väärtustel GFlow = %.0f ja GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Arvutatud lagi %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Tissue %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Ohutuspeatus:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Ohutuspeatus:teadmata aeg @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko:teadmata aeg @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s⏎ Decos</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s⏎ pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s⏎ pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2734,96 +2887,96 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deco:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 In deco (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 sukeldumist)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 sukeldumine)</translation>
     </message>
diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts
index 059c8243f..29add83fd 100644
--- a/translations/subsurface_fi_FI.ts
+++ b/translations/subsurface_fi_FI.ts
@@ -62,12 +62,12 @@
         <translation>Esiasetetut tuonnit</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>Avaa CSV-tiedosto</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>CSV Tiedostot (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Tilavuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Paineluokka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Alkupaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Loppupaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Vaihda syvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Poista säiliö.</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>Säiliötä ei voida poistaa</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>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation>
     </message>
@@ -153,22 +153,22 @@ poistaa valitun sukellustietokoneen?</translation>
 <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>Malli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Laite ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Lempinimi</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>Poista sukellustietokone.</translation>
     </message>
@@ -176,12 +176,12 @@ poistaa valitun sukellustietokoneen?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>jalkaa/min</translation>
     </message>
@@ -194,87 +194,82 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>Näytä hakukenttä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Näkyvyys:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>laajenna kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>supista kaikki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>supista muut</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>erota sukellukset retkestä</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>luo uusi retki yläpuolelle</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>lisää sukellukset yläpuoliseen retkeen</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>liitä retki yllä olevaan retkeen</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>liitä retki alla olevaan retkeen</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>poista sukellukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>tallenna nimellä</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>vie UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>muuta aikoja</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>Tallenna sukellukset nimellä...</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>Tallenna nimellä</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>UDDF -tiedostot (*.uddf *.UDDF)</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>yhdistä valitut sukellukset</translation>
     </message>
@@ -302,23 +297,17 @@ poistaa valitun sukellustietokoneen?</translation>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Viimeinen pysähdys kuudessa metrissä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Alkuaika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Ilmanpaine</translation>
     </message>
@@ -407,72 +396,143 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>päiväys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>puku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>kohde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ poista ensin pysähdykset.</translation>
     <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>Muistiinpanot</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>Kohde</translation>
     </message>
@@ -613,7 +673,7 @@ poista ensin pysähdykset.</translation>
     </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>Muistiinpanot</translation>
     </message>
@@ -628,191 +688,188 @@ poista ensin pysähdykset.</translation>
         <translation>Tiedot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Pinta-aika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Käytetyt kaasut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Kaasun kulutus</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>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Maksimisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Keskisyvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>Happikertymä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Ilmanpaine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Ilman lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Veden lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Suolapitoisuus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Tilastot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Lämpötila</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Kokonaiskesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Sukelluksia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Säiliöt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Lisää säiliö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Painot</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>Lisää painojärjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Matkakohde</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>Matkan muistiinpanot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Tallenna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Peruuta</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>Tätä sukellusretkeä muokataan.</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>Muokataan useita sukelluksia.</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>Tätä sukellusta muokataan.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>tuntematon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -919,7 +976,7 @@ poista ensin pysähdykset.</translation>
     <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>Liitä tiedosto</translation>
     </message>
@@ -1154,84 +1211,89 @@ poista ensin pysähdykset.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Avaa tiedosto</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus, ennen sukelluksen suunnittelua.</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Käyttöohje</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Subsurfacen käyttöohje ei löydy</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>Haluatko tallentaa muutoksesi tiedostoon %1?</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>Haluatko tallentaa muutoksesi tiedostoon?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Tallenna muutokset?</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&apos;t save them.</source>
         <translation>Muutokset hylätään, jos et tallenna niitä.</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>Viimeistele tämänhetkinen muokkaus, ennen kuin aloitat uuden.</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>Tallenna nimellä</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>Varoitus</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>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</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>UDDF -tiedostot (*.uddf *.UDDF)</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>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1254,239 +1316,259 @@ poista ensin pysähdykset.</translation>
         <translation>Kuvaaja</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listat ja taulukot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Fontti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Fontin koko</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Sukelluksia</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>Oletus lokitiedosto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Näytä epäkelvot</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Oletussäiliö</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>Käytä oletussäiliötä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Järjestelmä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Brittiläinen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Mukauta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>metri</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>jalka</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Paine</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Tilavuus</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>litra</translation>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>kuutiojalka</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Lämpötila</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Painot</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Suodattimet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Paine</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Tilavuus</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Lämpötila</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Painot</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>pauna</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Aikayksiköt</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>Nousu/laskunopeuden yksikkö</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minuuttia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekuntia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Näytä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>kynnys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Sukellustietokoneen raportoima kattosyvyys</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>piirrä kattosyvyys punaisella</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Laskettu kattosyvyys</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>näytä kaikki kudokset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3m portaat</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>Laske NDL/TTS</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>GFLow maksimisyvyydessä</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Sekalaiset</translation>
     </message>
@@ -1496,32 +1578,37 @@ poista ensin pysähdykset.</translation>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>Pintakulutus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFhigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Avaa oletustiedosto</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>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1529,12 +1616,22 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>Tulosta</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Tulosta</translation>
     </message>
@@ -1542,37 +1639,37 @@ poista ensin pysähdykset.</translation>
 <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>Sukellus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Ajankohta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Syvyys</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Kesto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Sukellusvanhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Sukelluspari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Kohde</translation>
     </message>
@@ -1736,30 +1833,45 @@ poista ensin pysähdykset.</translation>
         <translation>Muuta</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>ilma</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>EAN%1</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>Vaihto avoimeen ilman kiertoon</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>alku</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>loppu</translation>
@@ -1768,72 +1880,72 @@ poista ensin pysähdykset.</translation>
 <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>tuntematon</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>Sukellus #%1 - %2</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>Suurin syvyys: %1 %2</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>Kesto: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Kaasu:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>Pintakulutus:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Painot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Muistiinpanot:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Sukellusvanhin:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Sukelluspari:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Puku:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Näkyvyys:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Yleisarvio:</translation>
     </message>
@@ -1851,11 +1963,6 @@ poista ensin pysähdykset.</translation>
         <translation>Poista tämä etappi</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>Ei sijaintitietoa - kaksoisnäpäytä sijaintia asettaaksesi sukelluskohteen</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Sulje</translation>
@@ -1875,6 +1982,11 @@ poista ensin pysähdykset.</translation>
         <source>Maximum</source>
         <translation>Korkein</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ poista ensin pysähdykset.</translation>
 <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>Verkkopalvelu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Odota...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Yhdistetään...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Lataus valmistui</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Yhteysvirhe:</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>Tuntematon käyttäjä!</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>Vastauksen jäsentäminen ei onnistu!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Lataus onnistui!</translation>
     </message>
@@ -1989,17 +2106,17 @@ poista ensin pysähdykset.</translation>
 <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>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2007,7 +2124,7 @@ poista ensin pysähdykset.</translation>
 <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>Tiedot</translation>
     </message>
@@ -2015,12 +2132,12 @@ poista ensin pysähdykset.</translation>
 <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>Kuvaus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2053,30 +2170,40 @@ poista ensin pysähdykset.</translation>
         <translation>Käyttäjätunnus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Lähetä</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Painot</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>Poista painojärjestelmä näpäyttämällä ikonia.</translation>
     </message>
@@ -2084,79 +2211,79 @@ poista ensin pysähdykset.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Vuosi
 &gt; Kuukausi / Retki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Kesto
 Kokonais</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Keskim.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Lyhin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Pisin</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>Dyvyys (%1)
 Keski</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>
 Alin</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>
 Suurin</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>SAC (%1)
 Keski</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>Lämpö (%1)
@@ -2172,53 +2299,53 @@ Keski</translation>
     </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>bar</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>psi</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>l</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>ft³</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>m</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>ft</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>pauna</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>kg</translation>
     </message>
@@ -2267,8 +2394,8 @@ Keski</translation>
         <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 &apos;%s&apos;</source>
         <translation>Tiedoston &apos;%s&apos; avaaminen epäonnistui</translation>
     </message>
@@ -2279,8 +2406,8 @@ Keski</translation>
         <translation>Tiedoston &apos;%s&apos; lukeminen epäonnistui. Käytä Liitä -toimintoa CSV -tiedostoille</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>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation>
     </message>
@@ -2626,133 +2753,133 @@ perustuu arvoihin GFlow = %.0f ja GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P: %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T: %.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 N:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Laskettu katto %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Kudos %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Turvapysähdys: %u min @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 S:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Turvapysähdys: tuntemat. aika @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko: %u min @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko: tuntem. aika @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 dekossa</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL: %u min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS: %u %%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s: %.2f bar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s: %.2f bar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe: %.2f bar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD: %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2763,97 +2890,97 @@ END: %d %s
 EADD: %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deco:%umin @ %.0f %s (lask.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 Dekossa (lask.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (lask.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (lask.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sA: %d:%02d min</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>%s %sS:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sS:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sN:%.2f%s</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>%s %sN:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %3.%2.%4 %5:%6</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>%2.%1.%3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dive)</translation>
     </message>
diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts
index 68af1571a..8256f0206 100644
--- a/translations/subsurface_fr_FR.ts
+++ b/translations/subsurface_fr_FR.ts
@@ -62,12 +62,12 @@
         <translation>Importations préconfigurées</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>Ouvrir un fichier CSV</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>Fichiers CSV (*.csv)</translation>
     </message>
@@ -75,57 +75,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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Press. Service</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Press. Début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Press. Fin</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Changement à</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Cliquer ici retirera ce bloc.</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>Le bloc ne peut être retiré.</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>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation>
     </message>
@@ -153,22 +153,22 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <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>Modèle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Identifiant du périphérique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Surnom</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>Cliquer ici retirera cet ordinateur de plongée.</translation>
     </message>
@@ -176,12 +176,12 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,82 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>Montrer la barre de recherche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Visible:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>tout déplier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>tout replier</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>replier les autres</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>retirer plongée(s) du groupe</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>créer un nouveau groupe au-dessus</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>ajouter plongée(s) au groupe immédiatement au-dessus</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>fusionner le groupe avec le groupe au-dessus</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>fusionner le groupe avec le groupe au dessous</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>supprimer plongée(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Enregistrer sous</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>Exporter comme un fichier UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>décaler l&apos;heure</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>Enregistrer les plongées sous...</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>Enregistrer le fichier sous</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>Fichiers UDDF (*.uddf *.UDDF)</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>fusionner les plongées sélectionnées</translation>
     </message>
@@ -302,23 +297,17 @@ l&apos;ordinateur de plongée sélectionné ?</translation>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Dernier palier à 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Heure de début</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Pression atmosphérique</translation>
     </message>
@@ -407,72 +396,143 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>pied</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>combinaison</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>blk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>lieu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>SNCmax</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ Veuillez d&apos;abord les supprimer.</translation>
     <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>Notes de plongée</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>Lieu</translation>
     </message>
@@ -613,7 +673,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     </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>Notes</translation>
     </message>
@@ -628,191 +688,188 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Détails de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervalle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gaz utilisés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gaz consommé</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>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Profondeur max.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Profondeur moy.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Pression d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Température air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Température eau</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Temps de plongée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salinité</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Stats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Température</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Temps total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Plongées</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Blocs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Ajouter un bloc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Poids</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>Ajouter un système de poids</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Lieu du groupe</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>Notes du groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Annuler</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>Ce groupe est en train d&apos;être édité.</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>Plusieurs plongées sont en train d&apos;être éditées.</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>Cette plongée est en train d&apos;être éditée.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>inconnu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -919,7 +976,7 @@ Veuillez d&apos;abord les supprimer.</translation>
     <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>Importer des fichiers</translation>
     </message>
@@ -1154,84 +1211,89 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Ouvrir un Fichier</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>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</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>Veuillez enregistrer ou annuler vos modifications en cours avant de démarrer une planification.</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>Veuillez enregistrer ou annuler vos modifications en cours avant d&apos;ajouter une nouvelle plongée.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Manuel utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Impossible de trouver le manuel de Subsurface</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>Voulez-vous enregistrer les modifications du fichier %1 ?</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>Voulez-vous enregistrer les modifications du fichier de données ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Enregistrement des changements ?</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&apos;t save them.</source>
         <translation>Les modifications seront perdues si vous ne les enregistrez pas.</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>Veuillez finir votre modification en cours avant d&apos;en faire une autre.</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>Enregistrer le fichier sous</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>Avertissement</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>Veuillez enregistrer ou annuler vos modifications en cours avant d&apos;ouvrir un nouveau fichier.</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>Fichiers UDDF (*.uddf *.UDDF)</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>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1254,239 +1316,259 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Graphique</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listes et Tables</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Taille de police</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Plongées</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>Fichier de plongée par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Afficher invalide</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Bloc par défaut</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>Utiliser le bloc par défaut</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Système</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Métrique</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Impérial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personnalisé</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Mètre</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Pieds</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Pression</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litre</translation>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>Pieds³</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Température</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Poids</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filtrer</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Pression</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Température</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Poids</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>livre US</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Unités de temps</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>Dénominateur de vitesse de montée/descente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Secondes</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Montrer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>limite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Plafond signalé par l&apos;ordinateur</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>Afficher en rouge le plafond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Plafond calculé</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>montrer tous les tissus</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>incréments de 3m</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>Calculer LND/TRS</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>GFLow à la profondeur max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
@@ -1496,32 +1578,37 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Préférences</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>PPO2 max</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>Consommation d&apos;air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Ouvrir le fichier de plongée par défaut</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>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1529,12 +1616,22 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Imprimer</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Imprimer</translation>
     </message>
@@ -1542,37 +1639,37 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Plongée n°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Profondeur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Durée</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Chef</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Binôme</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
@@ -1736,30 +1833,45 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Editer</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>air</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>EAN%1</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>Passer en CO</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> début</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> fin</translation>
@@ -1768,72 +1880,72 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>inconnu</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>Plongée #%1 - %2</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>Profondeur max: %1 %2</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>Durée: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gaz utilisé:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>Consommation d&apos;air:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>SNC Max.:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Poids:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notes:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Chef de palanquée:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Binôme:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Combinaison:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Visi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Évaluation:</translation>
     </message>
@@ -1851,11 +1963,6 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>Supprimer ce point</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>Pas d&apos;information de localisation - déplacez la carte et double cliquez pour définir le lieu de plongée</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Fermer</translation>
@@ -1875,6 +1982,11 @@ Veuillez d&apos;abord les supprimer.</translation>
         <source>Maximum</source>
         <translation>Maximum</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Serveur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Veuillez patienter jusqu&apos;à l&apos;obtention de résultats...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Connexion en cours...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Téléchargement terminé</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Erreur de connexion : </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>Identifiant utilisateur incorrect.</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>Impossible de lire la réponse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Téléchargement réussi</translation>
     </message>
@@ -1989,17 +2106,17 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2007,7 +2124,7 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Information</translation>
     </message>
@@ -2015,12 +2132,12 @@ Veuillez d&apos;abord les supprimer.</translation>
 <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>Description</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2053,30 +2170,40 @@ Veuillez d&apos;abord les supprimer.</translation>
         <translation>ID utilisateur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Envoyer</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Poids</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>Cliquer ici retirera ce système de poids.</translation>
     </message>
@@ -2084,79 +2211,79 @@ Veuillez d&apos;abord les supprimer.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Année
 &gt; Mois / Groupe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>N°</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Durée
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Moyenne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Plus courte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Plus longue</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>Pronfondeur (%&amp;)
 Moyenne</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>
 Minimum</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>
 Maximum</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>SAC (%1)
 Moyenne</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>Temp. (%1)
@@ -2172,53 +2299,53 @@ Moyenne</translation>
     </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>bar</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>psi</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>l</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>pied³</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>m</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>pied</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>livre US</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>kg</translation>
     </message>
@@ -2267,8 +2394,8 @@ Moyenne</translation>
         <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 &apos;%s&apos;</source>
         <translation>Impossible de la lecture « %s »</translation>
     </message>
@@ -2279,8 +2406,8 @@ Moyenne</translation>
         <translation>Impossible de lire &apos;%s&apos;. Veuillez utiliser l&apos;importation de fichier CSV.</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>Le nombre maximal de colonnes supporté pour les importations de fichiers CSV est %d.</translation>
     </message>
@@ -2626,133 +2753,133 @@ basé sur un GFlow = %.0f et un GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P : %d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T : %.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Plafond calculé %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Tissu %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Arrêt de sécurité : %umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 P:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Arrêt de sécurité : durée inconnue @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Décompression : %umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Décompression : durée inconnue @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 En décompression</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 LND : %umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 SNC : %u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s : %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s : %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe : %.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD : %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2763,97 +2890,97 @@ END : %d%s
 EADD : %d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deco:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 En déco (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 LND:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TRS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sPd:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sPd:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 plongées)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 plongée)</translation>
     </message>
diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts
index 0434321f1..65bbcbfd0 100644
--- a/translations/subsurface_he.ts
+++ b/translations/subsurface_he.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>גודל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>לחץ עבודה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>לחץ התחלתי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>לחץ סופי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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>דגם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>מזהה התקן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>כינוי</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"/>
     </message>
@@ -175,12 +175,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>ליטר לדקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>רגל מעוקב לדקה</translation>
     </message>
@@ -193,87 +193,82 @@
         <translation>הצג חיפוש</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>הצג הכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>הסתר הכל</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="749"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>שמור קובץ בשם</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>אחד צלילות נבחרות</translation>
     </message>
@@ -301,23 +296,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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>עצירה אחרונה ב6 מ&apos;</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>זמן התחלה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>לחץ (אטמ)</translation>
     </message>
@@ -406,72 +395,143 @@ 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>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>מטר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>רגל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>דקה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>ליברה</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </message>
 </context>
 <context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/>
+        <source>Invalid response from server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -550,13 +610,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>הערות צלילה</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>מיקום</translation>
     </message>
@@ -612,7 +672,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>הערות</translation>
     </message>
@@ -627,191 +687,188 @@ Please, remove them first.</source>
         <translation>פרטי צלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>משך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>אוויר שנוצל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>אוויר שנוצל</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>עומק מירבי</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>עומק ממוצע</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>לחץ אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>טמפ&apos; אוויר</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>טמפ&apos; מים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>מליחות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>סטטסטיקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>טמפרטורה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>משך הצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>סה&quot;כ זמן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>צלילות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>מיכלים</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>הוסף מיכל</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>משקולות</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>הוסף מערכת משקולות</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>שמור</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>בטל</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"/>
     </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"/>
     </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"/>
     </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>לדקה</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>מז</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"/>
     </message>
@@ -918,7 +975,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>ייבא קבצים</translation>
     </message>
@@ -1153,84 +1210,89 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>פתך קובץ</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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>קובץ המדריך למשתמש לא נמצא</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>האם ברצונכם לשמור שינויים בקובץ %1 ?</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>האם לשמור שינויים בקובץ?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>לשמור שינויים?</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&apos;t save them.</source>
         <translation>כל השינויים יאבדו אם לא תשמרו אותם.</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"/>
     </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>שמור קובץ בשם</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -1253,239 +1315,259 @@ Please, remove them first.</source>
         <translation>גרף</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>רשימות וטבלאות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>גודל גופן</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>צלילות</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>קובץ ברירות המחדל לצלילה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>שגיאת הצגה</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>מערכת</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>מידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>אמריקאית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>התאמה אישית</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>מטר</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>רגל</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>לחץ</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>בר</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>נפח</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>ליטר</translation>
+        <source>psi</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>רגל מעוקב</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>טמפרטורה</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>צלסיוס</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>פרנהייט</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>משקל</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>פילטר</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>לחץ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>נפח</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>טמפרטורה</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>משקל</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>ליברה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>יחידות זמן</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>מקדם עליה וירידה</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>דקות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>שניות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>הצג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>לחץ חמצן</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>סף</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>לחץ חנקן</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>לחץ הליום</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"/>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1495,32 +1577,37 @@ Please, remove them first.</source>
         <translation>העדפות</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1528,12 +1615,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,37 +1638,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>תאריך</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>עומק</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>משך הצלילה</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>בן זוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>מיקום</translation>
     </message>
@@ -1735,30 +1832,45 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>אוויר</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"/>
     </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"/>
     </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>להתחיל</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>סוף</translation>
@@ -1767,72 +1879,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1850,11 +1962,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>סגור</translation>
@@ -1874,6 +1981,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>מקסימום</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1942,37 +2054,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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -1988,17 +2105,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation type="unfinished"/>
     </message>
@@ -2006,7 +2123,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"/>
     </message>
@@ -2014,12 +2131,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>קילוגרם</translation>
     </message>
@@ -2052,30 +2169,40 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>סיסמא</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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>סוג</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>משקל</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"/>
     </message>
@@ -2083,70 +2210,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2161,53 +2288,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"/>
     </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"/>
     </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"/>
     </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"/>
     </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>מטר</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>רגל</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>ליברה</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>קילוגרם</translation>
     </message>
@@ -2256,8 +2383,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 &apos;%s&apos;</source>
         <translation type="unfinished"/>
     </message>
@@ -2268,8 +2395,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2601,115 +2728,115 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2717,91 +2844,91 @@ EADD:%d%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts
index 3f3350f3d..131d1b87c 100644
--- a/translations/subsurface_hr_HR.ts
+++ b/translations/subsurface_hr_HR.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Veličina</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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>Model</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Naziv uređaja</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"/>
     </message>
@@ -175,12 +175,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"/>
     </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"/>
     </message>
@@ -193,87 +193,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -301,23 +296,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </message>
@@ -405,72 +394,143 @@ 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>Br.</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -549,13 +609,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>Bilješke</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>Lokacija</translation>
     </message>
@@ -611,7 +671,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>Bilješke</translation>
     </message>
@@ -626,191 +686,188 @@ Please, remove them first.</source>
         <translation>Informacije o uronu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</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"/>
     </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"/>
     </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"/>
     </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>SAC</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Trajanje</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistike</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Ukupno trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Uroni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Boce</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>nepoznato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -917,7 +974,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"/>
     </message>
@@ -1152,58 +1209,89 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Otvori datoteku</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Korisnički priručnik</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Spremi promjene?</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&apos;t save them.</source>
         <translation type="unfinished"/>
     </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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1226,239 +1314,259 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Uroni</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Metar</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Stope</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Pritisak</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litra</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>CuFt</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celzijusa</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Težina</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Pritisak</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Težina</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation type="unfinished"/>
-    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation type="unfinished"/>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1468,32 +1576,37 @@ Please, remove them first.</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1501,12 +1614,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1514,37 +1637,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>Uron br.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Dubina</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Trajanje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Lokacija</translation>
     </message>
@@ -1708,30 +1831,45 @@ Please, remove them first.</source>
         <translation>Uredi</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>zrak</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"/>
     </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>Neplanirani prelazak na OC sustav</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> započni</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> završi</translation>
@@ -1740,72 +1878,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>nepoznato</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1823,11 +1961,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Zatvori</translation>
@@ -1847,6 +1980,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>Max.</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1915,37 +2053,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>Web servis</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>Spajanje...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Greška u komunikaciji: </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>Neispravna korisnička oznaka</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>Ne mogu obraditi odziv</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Preuzimanje uspješno!</translation>
     </message>
@@ -1961,17 +2104,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1979,7 +2122,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"/>
     </message>
@@ -1987,12 +2130,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2025,30 +2168,40 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Lozinka</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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Vrsta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Težina</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"/>
     </message>
@@ -2056,70 +2209,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>Br.</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2134,53 +2287,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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2229,8 +2382,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 &apos;%s&apos;</source>
         <translation>Nije uspjelo čitanje &apos;%s&apos;</translation>
     </message>
@@ -2241,8 +2394,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2588,129 +2741,129 @@ temeljen na GFlow = %.0f i GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 D:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Izračunati strop %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Sigurnosni zastanak:%umin @ %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Sigurnosni zastoj:nepoz.vrijeme @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko:nepoznato vrijeme @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 U deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2721,91 +2874,91 @@ END:%d%s
 EADD:%d%s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts
index ef92e73f5..9f91cb22f 100644
--- a/translations/subsurface_id.ts
+++ b/translations/subsurface_id.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Ukuran</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>WorkPress</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>StartPress</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>EndPress</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>ID Perangkat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Nama Panggilan</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"/>
     </message>
@@ -175,12 +175,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>I/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -193,87 +193,82 @@
         <translation>Munculkan Kotak Pencari</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>Tampilkan semua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>Sembunyikan semua</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="749"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Simpan Berkas sebagai</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>Gabungkan selam berikut</translation>
     </message>
@@ -301,23 +296,17 @@
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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>Pemberhentian terakhir pada 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Waktu mulai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Tekanan ATM</translation>
     </message>
@@ -405,72 +394,143 @@ 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>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -549,13 +609,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>Catatan Selam</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>Lokasi</translation>
     </message>
@@ -611,7 +671,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>Catatan</translation>
     </message>
@@ -626,191 +686,188 @@ Please, remove them first.</source>
         <translation>Info Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Rentang  Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Seluruh Gas yang terpakai</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gas Terpakai</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Kedalaman Maks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Kedalaman Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Tekanan Udara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Suhu Udara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Suhu Air</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Waktu Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Kadar Garam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statisktik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Suhu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Rentang Waktu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Waktu Keseluruhan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Selam</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Tambah Tabung</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Berat</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>Tambah Sistem Berat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Lokasi Perjalanan</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>Catatan Perjalanan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Simpan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Batal</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"/>
     </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"/>
     </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"/>
     </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>/menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>Tak dikenal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>U</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>T</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>B</translation>
     </message>
@@ -917,7 +974,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>Impor Berkas</translation>
     </message>
@@ -1152,84 +1209,89 @@ Please, remove them first.</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Buka Berkas</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"/>
     </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"/>
     </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"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Panduan Subsurface tak dapat ditemukan</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>Anda ingin menyimpan perubahan yang sudah dilakukan pada Berkas %1</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>Anda ingin menyimpan perubahan yang sudah dilakukan pada datafile?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Simpan perubahan?</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&apos;t save them.</source>
         <translation>Perubahan akan hilang jika anda tidak simpan.</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"/>
     </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>Simpan Berkas sebagai</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"/>
     </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"/>
     </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"/>
     </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>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1252,239 +1314,259 @@ Please, remove them first.</source>
         <translation>Grafik</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Tabel dan daftar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Ukuran Huruf</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Selam</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>Berkas Dive Acuan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Cacat Layar</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Sistem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalisasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>edalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Feet</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Tekanan</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liter</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>CuFt</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Suhu</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celcius</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Berat</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kgkg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Saring</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Tekanan</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Suhu</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Berat</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Satuan Waktu</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>penyebut kecepatan naik/turun</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Menit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Detik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Tampilkan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>Ambang Batas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Batas yang dilaporkan perangkat</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>batas merah sejajar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>batas terhitung</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>Tampilkan semua jaringan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>Kenaikan 3m</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Lain-lain</translation>
     </message>
@@ -1494,32 +1576,37 @@ Please, remove them first.</source>
         <translation>Preferensi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Buka Berkas Log Acuan</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>Subsurface XML files (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1527,12 +1614,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1540,37 +1637,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>Selam#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Tanggal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Kedalaman</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Rekan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Lokasi</translation>
     </message>
@@ -1734,30 +1831,45 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>udara</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>EAN%1</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>Bailing out untuk OC</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>Mulai</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>Akhir</translation>
@@ -1766,72 +1878,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>Tak dikenal</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>Selam #%1 - %2</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>Kedalaman Maks: 1% 2%</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>Durasi: %1 menit</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1849,11 +1961,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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>Tak ada data lokasi - geser peta dan klik-ganda untuk set lokasi selam</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Tutup</translation>
@@ -1873,6 +1980,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>Maksimal</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1941,37 +2053,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>Webservice</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Unduh Selesai</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Kesalahan Koneksi:</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>identifikasi pengguna tidak cocok!</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>Respon gagal di telaah!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Unduh Sukses!</translation>
     </message>
@@ -1987,17 +2104,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>Penjelasan</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2005,7 +2122,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>Informasi</translation>
     </message>
@@ -2013,12 +2130,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>Penjelasan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kgkg</translation>
     </message>
@@ -2051,30 +2168,40 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Tipe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Berat</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"/>
     </message>
@@ -2082,77 +2209,77 @@ 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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Total Durasi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Rata-rata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Terpendek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Terjauh</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>Dalam (%1)
 Rata-rata</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>
 Minimal</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>
 Maksimal</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>SAC (%1)
 Rata-rata</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>Temp. (%1)
@@ -2168,53 +2295,53 @@ Rata-rata</translation>
     </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>bar</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>psi</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>I</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2263,8 +2390,8 @@ Rata-rata</translation>
         <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 &apos;%s&apos;</source>
         <translation>Gagal baca &apos;%s&apos;</translation>
     </message>
@@ -2275,8 +2402,8 @@ Rata-rata</translation>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2608,115 +2735,115 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2724,91 +2851,91 @@ EADD:%d%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts
index b28ca7b37..9bdf83ca3 100644
--- a/translations/subsurface_it_IT.ts
+++ b/translations/subsurface_it_IT.ts
@@ -62,12 +62,12 @@
         <translation>Importazioni preconfigurate</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>Apri File di Log CSV</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>Files CSV (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Dimensione</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Facendo click qui si rimuove la bombola.</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>La bombola non può essere rimossa</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>Questo gas è in uso. Solo le bombole che non sono usate nell&apos;immersione possono essere rimosse.</translation>
     </message>
@@ -153,22 +153,22 @@ il computer seleizonato?</translation>
 <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>Modello</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>ID della periferica</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Nickname</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>Facendo click qui si rimuove questo computer.</translation>
     </message>
@@ -176,12 +176,12 @@ il computer seleizonato?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>piedi cubi/min</translation>
     </message>
@@ -194,87 +194,82 @@ il computer seleizonato?</translation>
         <translation>Mostra la finestra di ricerca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Visibilità:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>espandi tutto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>collassa tutte le voci</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>rimuovi l&apos;immersione(i) dal viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>crea un nuovo viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>aggiungi immersione(i) immediatamente sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>unisci il viaggio con il viaggio sopra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>unisci il viaggio con il viaggio sotto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>cancella immersione(i)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>Esporta come UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Salva immersioni come ...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Salva come</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>unisci le immersioni selezionate</translation>
     </message>
@@ -302,23 +297,17 @@ il computer seleizonato?</translation>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Ultima sosta a 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Ora di inizio</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"/>
     </message>
@@ -407,72 +396,143 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>muta</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>Luogo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>max CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ Per favore, rimuovile prima.</translation>
     <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>Note dell&apos;immersione</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>Luogo</translation>
     </message>
@@ -613,7 +673,7 @@ Per favore, rimuovile prima.</translation>
     </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>Note</translation>
     </message>
@@ -628,191 +688,188 @@ Per favore, rimuovile prima.</translation>
         <translation>Informazioni sull&apos;immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervallo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gas usati</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gas consumato</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>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Profondità max</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Profondità media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Pressione aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Temperatura aria</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Temperatura dell&apos;acqua</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Tempo d&apos;Immersione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salinità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistiche</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Tempo Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Immersioni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Bombole</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Aggiungi bombola</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Pesi</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>Aggiungi un tipo di pesi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Luogo del viaggio</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>Note di viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Annulla</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>Questo viaggio è stato editato.</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>Si stanno modificando immersioni multiple.</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>Si sta modificando questa immersione </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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>sconosciuto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -919,7 +976,7 @@ Per favore, rimuovile prima.</translation>
     <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>Importa files</translation>
     </message>
@@ -1154,58 +1211,89 @@ Per favore, rimuovile prima.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Apri File</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Manuale Utente</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Manuale di Subsurface non trovato</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>Vuoi salvare le modifiche fatte nel file %1?</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>Vuoi salvare le modifiche fatte nel datafile?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Salvare le modifiche?</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&apos;t save them.</source>
         <translation>Le modifiche saranno perse se tu non le salvi.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Salva come</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>Avviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>File UDDF (*.uddf *.UDDF)</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>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1228,239 +1316,259 @@ Per favore, rimuovile prima.</translation>
         <translation>Grafico</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Liste e tabelle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Grandezza font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Immersioni</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>File immersione di default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Visualizzazione errata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Bombola di default</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>Usa questa bombola come default</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperiale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalizza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Metro</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Piedi</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Pressione</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
         <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litri</translation>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>Piedi cubi</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Pressione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Unità di Tempo</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>Denominatore della Risalita/Discesa </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Secondi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>soglia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Ceiling riportato dal computer</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Ceiling calcolato</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>mostra tutti i tessuti</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>incrementi di 3m</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>Calcola NDL/TTS</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>GFLow alla massima profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
@@ -1470,32 +1578,37 @@ Per favore, rimuovile prima.</translation>
         <translation>Preferenze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max ppO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>CAS</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Apri il log di default</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>File XML Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1503,12 +1616,22 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Stampa</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Stampa</translation>
     </message>
@@ -1516,37 +1639,37 @@ Per favore, rimuovile prima.</translation>
 <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>Immersione n.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Profondità</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Durata</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Compagno</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Luogo</translation>
     </message>
@@ -1710,30 +1833,45 @@ Per favore, rimuovile prima.</translation>
         <translation>Modifica</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>aria</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>EAN1%</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>Bailing out in circuito aperto</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>inizio</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>fine</translation>
@@ -1742,72 +1880,72 @@ Per favore, rimuovile prima.</translation>
 <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>sconosciuto</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>Immersione #%1 - %2</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>Massima profondità: %1 %2</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>Durata: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Miscela usata:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>CAS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Pesi:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Compagno:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Muta:</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Valutazione:</translation>
     </message>
@@ -1825,11 +1963,6 @@ Per favore, rimuovile prima.</translation>
         <translation>Rimuovi questo punto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Nessun dato sul luogo - muoversi sulla mappa e fare doppio click per settare il luogo</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Chiudi</translation>
@@ -1849,6 +1982,11 @@ Per favore, rimuovile prima.</translation>
         <source>Maximum</source>
         <translation>Massimo</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1917,37 +2055,42 @@ Per favore, rimuovile prima.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Aspetta un attimo abbiamo qualcosa...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>In connessione...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Download finito</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Errore di connessione:</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>Identificatore dell&apos;utente non valido!</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>Non posso analizzare la risposta!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Download effettuato!</translation>
     </message>
@@ -1963,17 +2106,17 @@ Per favore, rimuovile prima.</translation>
 <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>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1981,7 +2124,7 @@ Per favore, rimuovile prima.</translation>
 <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>Informazione</translation>
     </message>
@@ -1989,12 +2132,12 @@ Per favore, rimuovile prima.</translation>
 <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>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,30 +2170,40 @@ Per favore, rimuovile prima.</translation>
         <translation>ID utente</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Invia</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</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>Facendo click qui si rimuove il sistema di pesi.</translation>
     </message>
@@ -2058,79 +2211,79 @@ Per favore, rimuovile prima.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Anno 
 &gt; Mese / Viaggio</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Durata 
 Totale</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Media</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Più corta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Più lunga</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>Profondità (%1)
 Media</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>
 Minimo</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>
 Massimo</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>SAC (%1)
 Media</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>Temp. (%1)
@@ -2146,53 +2299,53 @@ Media</translation>
     </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>bar</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>psi</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>l</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>piedi cubi</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2241,8 +2394,8 @@ Media</translation>
         <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 &apos;%s&apos;</source>
         <translation>Impossibile leggere &apos;%s&apos;</translation>
     </message>
@@ -2253,8 +2406,8 @@ Media</translation>
         <translation>Errore di lettura &apos;%s&apos;.  Usa importa per i file CSV.</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>Il numero massimo di colonne supportate nel file CSV è di %d</translation>
     </message>
@@ -2601,117 +2754,117 @@ basato su GFlow = %.0f e GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s⏎ T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Calcolo ceiling %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s⏎ Sosta di sicurezza:%umin @ %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s⏎ Sosta di sicurezza:tempo sconosciuto @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s⏎ Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s⏎ Deco:tempo sconosciuto @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s⏎ In decompressione</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s⏎ NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s⏎ CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s⏎ pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s⏎ pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s⏎ pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s⏎ MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2722,95 +2875,95 @@ END:%d%s
 EADD:%d%s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 In decompressione (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="473"/>
+        <location filename="../qt-gui.cpp" line="482"/>
         <source>%1 %2, %3
 %4:%5</source>
         <translation>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 immersioni)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 immersione)</translation>
     </message>
diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts
index b3944f193..2e5fcad43 100644
--- a/translations/subsurface_nb_NO.ts
+++ b/translations/subsurface_nb_NO.ts
@@ -62,12 +62,12 @@
         <translation>Prekonfigurerte importer</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>Åpne CSV-loggfil</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>CSV-filer (*.csv)</translation>
     </message>
@@ -75,57 +75,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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Makstrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Starttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Sluttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O₂%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Gassbytte ved</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klikk her for å fjerne denne flaska.</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>Flaska kan ikke fjernes</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>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation>
     </message>
@@ -152,22 +152,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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Enhets-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Navn</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>Klikk her for å fjerne denne computeren.</translation>
     </message>
@@ -175,12 +175,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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>ft³/min</translation>
     </message>
@@ -193,87 +193,82 @@
         <translation>Vis søkeboks</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Synlig:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>vis alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>slå sammen alle turer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>slå sammen andre turer</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>fjern dykk fra tur</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>legg til ny tur over denne</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>legg dykk til turen over</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>slå sammen tur med turen over</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>slå sammen tur med turen under</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>slett dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>lagre som</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>eksporter som UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>forskyvning av tidspunkter</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>Lagre dykk som...</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>Lagre som</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>UDDF-filer (*.uddf *.UDDF)</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>slå sammen valgte dykk</translation>
     </message>
@@ -301,23 +296,17 @@
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Siste stopp på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Atmosfæretrykk</translation>
     </message>
@@ -406,72 +395,143 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>drakt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>sted</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maks CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -550,13 +610,13 @@ Fjern dem før du gjør dette.</translation>
     <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>Dykk</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>Sted</translation>
     </message>
@@ -612,7 +672,7 @@ Fjern dem før du gjør dette.</translation>
     </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>Notater</translation>
     </message>
@@ -627,191 +687,188 @@ Fjern dem før du gjør dette.</translation>
         <translation>Informasjon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gasser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gasskonsum</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Snittdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Lufttrykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Vanntemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dykketid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Saltholdighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistikk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Dykk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Flasker</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Legg til flaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Vekter</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>Legg til vektsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Tursted</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>Turnotater</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Avbryt</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>Denne turen redigeres.</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>Flere dykk redigeres.</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>Dette dykket redigeres.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>ukjent</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>Ø</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>V</translation>
     </message>
@@ -918,7 +975,7 @@ Fjern dem før du gjør dette.</translation>
     <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>Importer filer</translation>
     </message>
@@ -1153,84 +1210,89 @@ Fjern dem før du gjør dette.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Åpne fil</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>Lagre eller avbryt redigeringen før du lukker fila.</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>Lagre eller avbryt redigeringa før du planlegger et dykk.</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>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Brukermanual</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Finner ikke manualen</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>Vil du lagre endringene i %1?</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>Vil du lagre endringene?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Lagre endringer?</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&apos;t save them.</source>
         <translation>Endringer vil gå tapt hvis du ikke lagrer.</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>Avslutt redigeringa før du redigerer et nytt.</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>Lagre som</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>Advarsel</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>Lagre eller avbryt redigeringa før du åpner en ny fil.</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>UDDF-filer (*.uddf *.UDDF)</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>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1253,239 +1315,259 @@ Fjern dem før du gjør dette.</translation>
         <translation>Graf</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Lister og tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Skriftstørrelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Dykk</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>Standard dykkelogg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Vis ugyldige</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Standardflaske</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>Bruk standardflaske</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Britiske mål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personaliser</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>fot</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Trykk</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volum</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liter</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>Ft³</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Vekt</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Trykk</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volum</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Vekt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Tidsenheter</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>Enhet for opp-/nedstigningshastighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO₂</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>grenseverdi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Tak fra dykkecomputer</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>vis tak med rød farge</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Kalkulert tak</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>vis alle vev</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3-meterstrinn</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>Regn ut NDL/TTS</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>GF lav ved maksdybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Ymse</translation>
     </message>
@@ -1495,32 +1577,37 @@ Fjern dem før du gjør dette.</translation>
         <translation>Valg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max ppO₂</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GF lav</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GF høy</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Åpne standardlogg</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>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1528,12 +1615,22 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Skriv ut</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -1541,37 +1638,37 @@ Fjern dem før du gjør dette.</translation>
 <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>Dykk nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Dybde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Varighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Sted</translation>
     </message>
@@ -1735,30 +1832,45 @@ Fjern dem før du gjør dette.</translation>
         <translation>Rediger</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>pO₂</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>luft</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>EAN%1</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>Bytter til OC</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> start</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> slutt</translation>
@@ -1767,72 +1879,72 @@ Fjern dem før du gjør dette.</translation>
 <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>ukjent</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>Dykk nr. %1- %2</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>Max dybde: %1 %2</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>Varighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gass brukt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Mac. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Vekter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Dykkeleder:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Drakt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Vurdering:</translation>
     </message>
@@ -1850,11 +1962,6 @@ Fjern dem før du gjør dette.</translation>
         <translation>Fjern dette punktet</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>Ingen stedsdata - finn sted i kartet og dobbelklikk for å sette posisjon</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Lukk</translation>
@@ -1874,6 +1981,11 @@ Fjern dem før du gjør dette.</translation>
         <source>Maximum</source>
         <translation>Maksimum</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1942,37 +2054,42 @@ Fjern dem før du gjør dette.</translation>
 <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>Nettjeneste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Vent litt...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Kobler til...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Nedlasting er ferdig</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Feil med forbindelse</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>Ugyldig bruker-ID!</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>Kan ikke lese svar!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Ferdig å laste ned</translation>
     </message>
@@ -1988,17 +2105,17 @@ Fjern dem før du gjør dette.</translation>
 <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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2006,7 +2123,7 @@ Fjern dem før du gjør dette.</translation>
 <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>Informasjon</translation>
     </message>
@@ -2014,12 +2131,12 @@ Fjern dem før du gjør dette.</translation>
 <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>Beskrivelse</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2052,30 +2169,40 @@ Fjern dem før du gjør dette.</translation>
         <translation>Bruker-ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Last opp</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Vekt</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>Klikk her for å fjerne dette vektsystemet</translation>
     </message>
@@ -2083,79 +2210,79 @@ Fjern dem før du gjør dette.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Måned / Tur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Varighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Snitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Kortest</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Lengst</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>Dybde (%1)
 Snitt</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>
 Minimum</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>
 Maksimum</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>SAC (%1)
 Snitt</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>Temp. (%1)
@@ -2171,53 +2298,53 @@ Snitt</translation>
     </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>bar</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>psi</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>l</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>ft³</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>m</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>ft</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>pund</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>kg</translation>
     </message>
@@ -2266,8 +2393,8 @@ Snitt</translation>
         <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 &apos;%s&apos;</source>
         <translation>Kunne ikke åpne &apos;%s&apos;</translation>
     </message>
@@ -2278,8 +2405,8 @@ Snitt</translation>
         <translation>Klarte ikke å lese &apos;%s&apos;. Bruk CSV-importen isteden.</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>Maks antall kolonner i CSV-importen er %d</translation>
     </message>
@@ -2625,133 +2752,133 @@ basert på GF lav = %.0f og GF høy = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Kalkulert tak %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Vev %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Sikkerhetsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Sikkerhetsstopp: ukjent tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko:ukjent tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 I deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2762,97 +2889,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deko:%umin @ %.0f %s (kalk.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 I deko (kalk.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (kalk.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (kalk.)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dykk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dykk)</translation>
     </message>
diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts
index 01ec78398..5491055de 100644
--- a/translations/subsurface_nl_NL.ts
+++ b/translations/subsurface_nl_NL.ts
@@ -62,12 +62,12 @@
         <translation>Vooraf ingestelde import</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>CSV logboek openen</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>CSV Bestanden (*.csv)</translation>
     </message>
@@ -75,57 +75,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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Werkdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Startdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Einddruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Wissel op</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klik hier om de fles te verwijderen.</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>Fles kan niet verwijderd worden</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>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden.</translation>
     </message>
@@ -153,22 +153,22 @@ duikcomputer wilt verwijderen?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Toestel ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Apparaatnaam</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>Klik hier om deze duikcomputer te verwijderen.</translation>
     </message>
@@ -176,12 +176,12 @@ duikcomputer wilt verwijderen?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -194,87 +194,82 @@ duikcomputer wilt verwijderen?</translation>
         <translation>Zoekvak Tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Zichtbaar:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>alles uitklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>alles inklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>andere samenklappen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>duik(en) uit trip verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>nieuwe duik aanmaken hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>duik(en) toevoegen aan de trip hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>trip samenvoegen met trip hierboven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>trip samenvoegen met trip hieronder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>duik(en) verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>bewaren Als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>Als UDDF exporteren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>tijdstippen verschuiven</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Duiken Bewaren Als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Bestand Bewaren als</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>geselecteerde duiken samenvoegen</translation>
     </message>
@@ -302,23 +297,17 @@ duikcomputer wilt verwijderen?</translation>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Laatste stop op 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Starttijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Druk (atm)</translation>
     </message>
@@ -407,72 +396,143 @@ Verwijder deze eerst.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>duikpak</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>locatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>max. CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -544,20 +604,20 @@ Verwijder deze eerst.</translation>
     <message>
         <location filename="../qt-ui/globe.cpp" line="104"/>
         <source>Edit Selected Dive Locations</source>
-        <translation type="unfinished"/>
+        <translation>Bewerk geselecteerde duiklocaties</translation>
     </message>
 </context>
 <context>
     <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>Duiknotities</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>Locatie</translation>
     </message>
@@ -613,7 +673,7 @@ Verwijder deze eerst.</translation>
     </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>Notities</translation>
     </message>
@@ -628,191 +688,188 @@ Verwijder deze eerst.</translation>
         <translation>Duikinformatie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Interval</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gebruikte gassen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gasverbruik</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>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Gem. Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Luchtdruk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Luchttemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Watertemperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Duiktijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Zoutgehalte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistieken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatuur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Totale tijd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Duiken</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Flessen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Fles toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Gewichten</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>Gewichtssysteem toevoegen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Trip locatie</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>Trip Nota&apos;s</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Opslaan</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Annuleren</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>Deze trip wordt bewerkt.</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>Meerdere duiken worden bewerkt.</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>Deze duik wordt bewerkt.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>onbekend</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>Z</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>O</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -919,7 +976,7 @@ Verwijder deze eerst.</translation>
     <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>Bestanden importeren</translation>
     </message>
@@ -1154,58 +1211,89 @@ Verwijder deze eerst.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Bestand openen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation>
+    </message>
+    <message>
+        <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>Bewaar of maak de huidige wijziging ongedaan voor U een duik plant.</translation>
+    </message>
+    <message>
+        <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>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Gebruikershandleiding</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>De handleiding kan niet gevonden worden</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>Wilt u de wijzigingen in bestand %1 bewaren?</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>Wilt u de wijzigingen bijhouden in het bestand?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Aanpassingen opslaan?</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&apos;t save them.</source>
         <translation>Wijzigingen gaan verloren als u deze niet bewaart.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Bestand Bewaren als</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>Waarschuwing</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF bestanden (*.uddf *.UDDF)</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>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1228,239 +1316,259 @@ Verwijder deze eerst.</translation>
         <translation>Grafiek</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Lijsten en Tabellen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Lettertype grootte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Duiken</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>Standaard Duikbestand</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Ongeldig Scherm</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Standaard fles</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>Gebruik standaard fles</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Systeem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrisch</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperiaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personaliseren</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>voet</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Druk</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>liter</translation>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>cuft</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatuur</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Gewicht</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Druk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatuur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Gewicht</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>US pond</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Tijdseenheden</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>Stijg-/daalsnelheid noemer</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Seconden</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Toon</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>drempelwaarde</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Plafond gerapporteerd door duikcomputer</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>plafond in het rood tekenen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Berekend plafond</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>alle compartimenten tonen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>3m stappen</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>NDL/TTS Berekenen</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>GFLow op max diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Allerlei</translation>
     </message>
@@ -1470,32 +1578,37 @@ Verwijder deze eerst.</translation>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>Gasverbruik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Standaard Logboek Openen</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>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1503,12 +1616,22 @@ Verwijder deze eerst.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>Afdrukken (&amp;P)</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Afdrukken</translation>
     </message>
@@ -1516,37 +1639,37 @@ Verwijder deze eerst.</translation>
 <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>Duik nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Diepte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Duur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Buddy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Locatie</translation>
     </message>
@@ -1710,30 +1833,45 @@ Verwijder deze eerst.</translation>
         <translation>Bewerken</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>lucht</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>EAN%1</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>Schakel om naar OC</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> begin</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> eind</translation>
@@ -1742,72 +1880,72 @@ Verwijder deze eerst.</translation>
 <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>onbekend</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>Duik #%1 - %2</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>Max diepte: %1 %2</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>Duur: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Verbruikt gas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>Gasverbruik:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Gewichten:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Nota&apos;s:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Buddy:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Duikpak:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Zichtbaarheid:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Beoordeling:</translation>
     </message>
@@ -1825,11 +1963,6 @@ Verwijder deze eerst.</translation>
         <translation>Dit punt verwijderen</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Geen locatiegegevens - verplaats de kaart en dubbelklik om een duiklocatie te kiezen</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Sluiten</translation>
@@ -1849,6 +1982,11 @@ Verwijder deze eerst.</translation>
         <source>Maximum</source>
         <translation>Grootste</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1917,37 +2055,42 @@ Verwijder deze eerst.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Even geduld...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Verbinding wordt opgezet.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Download beëindigd</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Verbindingsfout:</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>Ongeldige gebruikersidentificatie</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>Kan antwoord niet parsen!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Laden succesvol voltooid!</translation>
     </message>
@@ -1963,17 +2106,17 @@ Verwijder deze eerst.</translation>
 <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>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1981,7 +2124,7 @@ Verwijder deze eerst.</translation>
 <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>Informatie</translation>
     </message>
@@ -1989,12 +2132,12 @@ Verwijder deze eerst.</translation>
 <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>Beschrijving</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,30 +2170,40 @@ Verwijder deze eerst.</translation>
         <translation>Gebruikers ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Uploaden</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Gewicht</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>Hier klikken om het gewichtssysteem te verwijderen</translation>
     </message>
@@ -2058,79 +2211,79 @@ Verwijder deze eerst.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Jaar
  &gt; Maand / Trip</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>Nr.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Duur
  Totaal</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Gemiddeld</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Kortste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Langste</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>Diepte (%1)
  Gemiddeld</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>
 Minimum</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>
 Maximum</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>Gasverbruik (%1)
  Gemiddeld</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>Temp. (%1)
@@ -2146,53 +2299,53 @@ Maximum</translation>
     </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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>US pond</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>kg</translation>
     </message>
@@ -2241,8 +2394,8 @@ Maximum</translation>
         <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 &apos;%s&apos;</source>
         <translation>Fout bij lezen van &apos;%s&apos;</translation>
     </message>
@@ -2253,8 +2406,8 @@ Maximum</translation>
         <translation>&apos;%s&apos; lezen is mislukt. Gebruik Importeren voor CSV bestanden.</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>Het maximum aantal kolommen bij CSV importeren is %d</translation>
     </message>
@@ -2600,133 +2753,133 @@ Gebaseerd op GFlow =  %.0f en GFhigh = %.0f
         <translation>EAN</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Berekend plafond %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Compartiment %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Veiligheidsstop:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 gasverbruik:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Veiligheidsstop:onbek.tijd @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:onbek.tijd @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 In deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2737,97 +2890,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deco:%umin @ %.0f %s (berekend)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 In deco (berekend)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (berekend)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (berekend)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 duiken)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 duik)</translation>
     </message>
diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts
index 5cb030567..21d80588f 100644
--- a/translations/subsurface_pl_PL.ts
+++ b/translations/subsurface_pl_PL.ts
@@ -62,12 +62,12 @@
         <translation>Predefiniowane konfiguracje</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>Otwórz plik CSV</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>Pliki CSV (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Pojemność</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Ciśnienie robocze</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Ciśnienie początkowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Ciśnienie końcowe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Zmiana na</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Kliknięcie tu usunie butlę z listy.</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>Butla nie może być usunięta.</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>Ten gaz jest używany. Można usuwać tylko butle, których nie używasz.</translation>
     </message>
@@ -153,22 +153,22 @@ wybrany komputer nurkowy?</translation>
 <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>Model</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>ID urządzenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Nazwa</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>Kliknięcie tu usunie komputer nurkowy.</translation>
     </message>
@@ -176,12 +176,12 @@ wybrany komputer nurkowy?</translation>
 <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> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,82 @@ wybrany komputer nurkowy?</translation>
         <translation>Pokaż okno wyszukiwania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Widoczne:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>rozwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>zwiń wszystkie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>zwiń pozostałe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>usuń nurkowanie(a) z grupy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>utwórz nową grupę powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>dodaj nurkowanie(a) do grupy powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>połącz grupę z grupą powyżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>połącz grupę z grupą poniżej</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>usuń nurkowanie(a)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>zapisz jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>eksportuj jako plik UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>zmień czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Zapisz nurkowania jako...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Zapisz plik jako</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>połącz wybrane nurkowania</translation>
     </message>
@@ -302,23 +297,17 @@ wybrany komputer nurkowy?</translation>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Ostatni przystanek na 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Początek o</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Ciśnienie atmosferyczne</translation>
     </message>
@@ -407,72 +396,143 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>skafander</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>butla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>miejsce</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     <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>Notatki</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>Miejsce</translation>
     </message>
@@ -613,7 +673,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     </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>Notatki</translation>
     </message>
@@ -628,191 +688,188 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Przerwa powierzchniowa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Dostępne gazy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Zużyty gaz</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Max głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Średnia głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Ciśnienie atmosferyczne</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Temperatura powietrza</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Temperatura wody</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Czas nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Zasolenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statystyka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Całkowity czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Nurkowania</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Butle</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Dodaj butlę</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Balast</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>Dodaj balast</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Miejsce nurkowań</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>Opis nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Anuluj</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"/>
     </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"/>
     </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"/>
     </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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>nieznana</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -919,7 +976,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
     <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>Importuj pliki</translation>
     </message>
@@ -1154,58 +1211,89 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Otwórz plik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>instrukcja obsługi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Nie można znaleźć dokumentacji Subsurface</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>Czy chcesz zapisać zmiany dokonane w pliku %1?</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>Czy chcesz zapisać wprowadzone zmiany?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Zapisać zmiany?</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&apos;t save them.</source>
         <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Zapisz plik jako</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>Ostrzeżenie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Pliki UDDF  (*.uddf *.UDDF)</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>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1228,239 +1316,259 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Wykres</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listy i tabele</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Rozmiar czcionki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Nurkowania</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>Domyślny plik nurkowań</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Pokazuj nurkowania oznaczone jako niepoprawne </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Domyślna butla</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>Użyj domyślnej butli</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metryczny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperialny</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Dostosuj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Metry</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Stopy</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Ciśnienie</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Objętość</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litry</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>cuft</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsjusz</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Balast</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filtr</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Ciśnienie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Objętość</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Balast</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Jednostki czasu</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>Mianownik szybkości zanurzania/wynurzania </translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>minuty</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>sekundy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Pokaż</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>próg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Sufit dekompresyjny z komputera nurkowego </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>rysuj sufit na czerwono</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Obliczony sufit dekompresjny</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>wszystkie tkanki</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>z krokiem 3m</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>Obliczenia NDL/TTS</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>GFLow na maksymalnej głębokości</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Różne</translation>
     </message>
@@ -1470,32 +1578,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Otwórz domyślny plik</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>Pliki Subsurface XML  (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1503,12 +1616,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>Drukuj</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Drukuj</translation>
     </message>
@@ -1516,37 +1639,37 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Nurkowanie nr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Głębokość</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Czas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Divemaster</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Miejsce</translation>
     </message>
@@ -1710,30 +1833,45 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Edytuj</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>powietrze</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>EAN%1</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>Przejście na obieg otwarty</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> początek</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> koniec</translation>
@@ -1742,72 +1880,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>nieznana</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>Nurkownie #%1 - %2</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>Max głębokość: %1 %2</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>Czas: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Użyty gaz:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Balast:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Opis:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Partner:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Skafander:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Widzialność:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Ocena:</translation>
     </message>
@@ -1825,11 +1963,6 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>Usuń ten punkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Nieznane miejsce - wybierz miejsce dwuklikiem na mapie  </translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Zamknij</translation>
@@ -1849,6 +1982,11 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <source>Maximum</source>
         <translation>max.</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1917,37 +2055,42 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Webservice</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Poczekaj chwilę...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Łączenie...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Pobieranie zakończone</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Błąd połączenia:</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>Niepoprawny identyfikator użytkownika!</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>Nie można przetworzyć odpowiedzi!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Pobieranie zakończone sukcesem!</translation>
     </message>
@@ -1963,17 +2106,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1981,7 +2124,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Informacja</translation>
     </message>
@@ -1989,12 +2132,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <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>Opis</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,30 +2170,40 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
         <translation>ID użytkownika</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Wyślij</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Rodzaj</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Balast</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>Kliknięcie tu usunie ten balast z listy.</translation>
     </message>
@@ -2058,74 +2211,74 @@ poza zakresem. Proszę je najpierw usunąć.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Rok 
  &gt; Miesiąc / grupa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Czas trwania
 całkowity</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>średni</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>najkrótszy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>najdłuższy</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>Głębokość (%1)
  średnia</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>minimalna</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>maksymalna</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>SAC (%1)
  średni</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>Temperatura (%1)
@@ -2141,53 +2294,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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2236,8 +2389,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 &apos;%s&apos;</source>
         <translation>Błąd odczytu &apos;%s&apos;</translation>
     </message>
@@ -2248,8 +2401,8 @@ Maximum</source>
         <translation>Nie udało sie odczytać &apos;%s&apos;. Użyj importu z pliku CSV.</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>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation>
     </message>
@@ -2595,133 +2748,133 @@ w oparciu o GFlow = %.0f oraz GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Obliczony sufit %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Tkanka %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Przyst. bezp.:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 Gł:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Przyst. bezp.:nieznany czas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:nieznany czas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 dekompresja</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2732,97 +2885,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deco:%umin @ %.0f %s (obliczone)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 deco (obliczone)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sGł:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sGł:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dives)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 nurkowanie)</translation>
     </message>
diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts
index 7a03fda22..c3e1c0087 100644
--- a/translations/subsurface_pt_BR.ts
+++ b/translations/subsurface_pt_BR.ts
@@ -62,12 +62,12 @@
         <translation>Importar pré-definições </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>Abrir arquivo CSV Log</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>Arquivo CSV (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Trocar aos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar esta garrafa.</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>A garrafa não pode ser eliminada</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>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation>
     </message>
@@ -153,22 +153,22 @@ remover o computador de mergulho seleccionado?</translation>
 <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>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Apelido</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>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -176,12 +176,12 @@ remover o computador de mergulho seleccionado?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>pés cúbicos/min</translation>
     </message>
@@ -194,87 +194,82 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Mostrar caixa de busca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Visível:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>colapsar outros</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>remover mergulho(s) desta viagem</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>criar nova viagem acima</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>adicionar mergulho(s) à viagem imediatamente acima</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>juntar viagem com a viagem acima</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>juntar viagem com a viagem abaixo</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>eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>salvar como</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>exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>mudar os tempos</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>Gravar mergulhos como...</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>Salvar aquivo como</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>Ficheiros UDDF  (*.uddf *.UDDF)</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>mesclar mergulhos selecionados</translation>
     </message>
@@ -302,23 +297,17 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Última parada aos 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Hora de início</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Pressão atmosférica</translation>
     </message>
@@ -407,72 +396,143 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>CNS máx</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ Por favor, remova-os primeiro</translation>
     <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>Notas do mergulho</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>Local</translation>
     </message>
@@ -613,7 +673,7 @@ Por favor, remova-os primeiro</translation>
     </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>Notas</translation>
     </message>
@@ -628,191 +688,188 @@ Por favor, remova-os primeiro</translation>
         <translation>Info do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gás utilizado</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gás consumido</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>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Profundidade Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Pressão do Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Temperatura do Ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Tempo de mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatura</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Cilindros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Lastro</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>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Local da viagem</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>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Cancelar</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>Esta viagem está a ser editada.</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>Estão a ser editados vários mergulhos.</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>Este mergulho está a ser editado.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>L</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -919,7 +976,7 @@ Por favor, remova-os primeiro</translation>
     <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>Importar arquivos</translation>
     </message>
@@ -1154,84 +1211,89 @@ Por favor, remova-os primeiro</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Abrir arquivo</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>Por favor, salve ou cancele o mergulho atual antes de fechar o arquivo.</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>Por favor, salve ou cancele o mergulho atual antes de planejar um mergulho.</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>Por favor, salve ou cancele o mergulho atual antes de tentar asicionar um mergulho.</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</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>Deseja gravar as alterações feitas ao ficheiro %1?</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>Deseja gravar as alterações feitas ao ficheiro de dados?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Salvar alterações?</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&apos;t save them.</source>
         <translation>As alterações serão perdidas se não forem gravadas.</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>Primeiro termine a edição atual antes de editar outro.</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>Salvar aquivo como</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>Aviso</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>Por favor, salve ou cancele o mergulho atual antes de abrir um novo arquivo.</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>Ficheiros UDDF  (*.uddf *.UDDF)</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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1254,239 +1316,259 @@ Por favor, remova-os primeiro</translation>
         <translation>Gráfico</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listas e tabelas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Mergulhos</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>Ficheiro de mergulhos padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Mostrar inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Garrafa padrão</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>Usar a Garrafa padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Metro</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Pés</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Pressão</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litro</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>pés cúbicos</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filtro</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Pressão</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Unidades de tempo</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>Denominador da velocidade de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>limite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Tecto reportado pelo computador de mergulho</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>pintar o tecto de vermelho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Tecto calculado</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>mostrar todos os tecidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>incrementos de 3 m</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>Calcular NDL/TTS</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>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
@@ -1496,32 +1578,37 @@ Por favor, remova-os primeiro</translation>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Abrir o logbook padrão</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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1529,12 +1616,22 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -1542,37 +1639,37 @@ Por favor, remova-os primeiro</translation>
 <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>Mergulho#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Parceiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Local</translation>
     </message>
@@ -1736,30 +1833,45 @@ Por favor, remova-os primeiro</translation>
         <translation>Editar</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>ar</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>EAN%1</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>Troca de emergência para circuito aberto</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>início</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>fim</translation>
@@ -1768,72 +1880,72 @@ Por favor, remova-os primeiro</translation>
 <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>desconhecido</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>Mergulho #%1 - %2</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>Profundidade máxima: %1 %2</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>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Companheiro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -1851,11 +1963,6 @@ Por favor, remova-os primeiro</translation>
         <translation>Remover este ponto</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>Não existem coordenadas - mova o mapa e dê um duplo clique para seleccionar o local de mergulho</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Fechar</translation>
@@ -1875,6 +1982,11 @@ Por favor, remova-os primeiro</translation>
         <source>Maximum</source>
         <translation>Máximo</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ Por favor, remova-os primeiro</translation>
 <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>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Espere um pouco até termos algo...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Conectando...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Transferência terminada</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Erro de conexão:</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>Identificação de utilizador inválida !</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>Não é possível analisar a resposta !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Operação de transferência bem sucedida!</translation>
     </message>
@@ -1989,17 +2106,17 @@ Por favor, remova-os primeiro</translation>
 <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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2007,7 +2124,7 @@ Por favor, remova-os primeiro</translation>
 <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>Informação</translation>
     </message>
@@ -2015,12 +2132,12 @@ Por favor, remova-os primeiro</translation>
 <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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2053,30 +2170,40 @@ Por favor, remova-os primeiro</translation>
         <translation>ID do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Carregar</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</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>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
@@ -2084,79 +2211,79 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</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>Profundidade (%1)
 Média</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>
 Mínimo</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>
 Máximo</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>Consumo (%1)
 Médio</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>Temp. (%1)
@@ -2172,53 +2299,53 @@ Médio</translation>
     </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>bar</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>psi</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>l</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>pés cúbicos</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2267,8 +2394,8 @@ Médio</translation>
         <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 &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
@@ -2279,8 +2406,8 @@ Médio</translation>
         <translation>Não foi possível ler &apos;%s&apos;. Use importar para ficheiros CSV.</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>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
     </message>
@@ -2627,133 +2754,133 @@ baseado em GFlow = %.0f e GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Tecto calculado %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Tecido %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Paragem de segurança:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 Consumo:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Paragem de segurança: tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 Em descompressão</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2764,97 +2891,97 @@ PNE:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Descompressão:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 Em descompressão (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts
index d3ae7f731..783b23216 100644
--- a/translations/subsurface_pt_PT.ts
+++ b/translations/subsurface_pt_PT.ts
@@ -62,12 +62,12 @@
         <translation>Importar pré-definições </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>Abrir ficheiro CSV</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>Ficheiros CSV (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Pressão de serviço</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Pressão inicial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Pressão final</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>% O2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Trocar aos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Ao clicar aqui irá eliminar esta garrafa.</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>A garrafa não pode ser eliminada</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>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation>
     </message>
@@ -153,22 +153,22 @@ remover o computador de mergulho seleccionado?</translation>
 <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>Modelo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>ID do dispositivo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Alcunha</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>Ao clicar aqui irá remover este computador de mergulho.</translation>
     </message>
@@ -176,12 +176,12 @@ remover o computador de mergulho seleccionado?</translation>
 <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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>pés cúbicos/min</translation>
     </message>
@@ -194,87 +194,82 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>Mostrar caixa de busca</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Visível:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>expandir todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>colapsar todos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>colapsar outros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>remover mergulho(s) desta viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>criar nova viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>adicionar mergulho(s) à viagem imediatamente acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>juntar viagem com a viagem acima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>juntar viagem com a viagem abaixo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>eliminar mergulho(s)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>gravar como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>exportar como UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>mudar os tempos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Gravar mergulhos como...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Gravar ficheiro como</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>juntar os mergulhos seleccionados</translation>
     </message>
@@ -302,23 +297,17 @@ remover o computador de mergulho seleccionado?</translation>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Última paragem aos 6 m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Hora de início</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Pressão atmosférica</translation>
     </message>
@@ -407,72 +396,145 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>pés</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>libras</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>fato</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>local</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>CNS máx</translation>
     </message>
 </context>
 <context>
+    <name>DivelogsDeWebServices</name>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="368"/>
+        <source>Invalid response from server</source>
+        <translation>Resposta inválida do servidor</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation>Esperada a tag XML &apos;DiveDateReader&apos;. Em vez disso recebemos &apos;%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation>A tag XML esperada &apos;DiveDates&apos; não foi encontrada</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation>Resposta XML mal formada. Linha %1: %2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation>A carregar a lista dos mergulhos...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation>A descarregar a lista dos mergulhos...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation>A descarregar %1 mergulhos</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation>Descarga terminada - %1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="614"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/>
+        <source>Corrupted download</source>
+        <translation>Descarga corrompida</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation>Não foi possível abrir o ficheiro:
+%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation>O ficheiro contém dados corrompidos:
+%1</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation>Carregamento terminado</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation>Erro na descarga: %1</translation>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -501,12 +563,12 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/>
         <source>Vendor</source>
-        <translation>Vendedor</translation>
+        <translation>Marca</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="32"/>
         <source>Dive Computer</source>
-        <translation>Computador de mergulho</translation>
+        <translation>Modelo</translation>
     </message>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.ui" line="45"/>
@@ -551,13 +613,13 @@ Por favor, remova-os primeiro</translation>
     <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>Notas</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>Localização</translation>
     </message>
@@ -574,12 +636,12 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/maintab.ui" line="155"/>
         <source>Buddy</source>
-        <translation>Companheiro</translation>
+        <translation>Companheiros</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="63"/>
         <source>Start time</source>
-        <translation>hora de início</translation>
+        <translation>Hora de início</translation>
     </message>
     <message>
         <location filename="../qt-ui/maintab.ui" line="72"/>
@@ -613,7 +675,7 @@ Por favor, remova-os primeiro</translation>
     </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>Notas</translation>
     </message>
@@ -628,191 +690,188 @@ Por favor, remova-os primeiro</translation>
         <translation>Informações do mergulho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
-        <translation>Intervalo</translation>
+        <translation>Intervalo de superfície</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gases usados</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gás consumido</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>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Prof. Máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Prof. Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Pressão </translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Temperatura do ar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
-        <translation>Duração do mergulho</translation>
+        <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salinidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Estatísticas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
-        <translation>Temperatura</translation>
+        <translation>Temperatura da água</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Tempo total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Mergulhos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Garrafas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Adicionar garrafa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Lastro</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>Adicionar sistema de lastro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Local da viagem</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>Notas sobre a viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Cancelar</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>Esta viagem está a ser editada.</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>Estão a ser editados vários mergulhos.</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>Este mergulho está a ser editado.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>desconhecido</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>O</translation>
     </message>
@@ -919,7 +978,7 @@ Por favor, remova-os primeiro</translation>
     <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>Importar ficheiros</translation>
     </message>
@@ -951,12 +1010,12 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="335"/>
         <source>&amp;Quit</source>
-        <translation>%Fechar</translation>
+        <translation>&amp;Fechar</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="343"/>
         <source>Import from &amp;dive computer</source>
-        <translation>Importar do %computador de mergulho</translation>
+        <translation>Importar do &amp;computador de mergulho</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="351"/>
@@ -971,7 +1030,7 @@ Por favor, remova-os primeiro</translation>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="359"/>
         <source>&amp;Edit Device Names</source>
-        <translation>%Editar nomes dos dispositivos</translation>
+        <translation>&amp;Editar nomes dos computadores</translation>
     </message>
     <message>
         <location filename="../qt-ui/mainwindow.ui" line="367"/>
@@ -1154,58 +1213,89 @@ Por favor, remova-os primeiro</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Abrir Ficheiro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation>
+    </message>
+    <message>
+        <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>Por favor grave ou cancele as edições a este mergulho antes de tentar planear outro.</translation>
+    </message>
+    <message>
+        <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>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Manual do utilizador</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Não foi possível encontrar o manual do Subsurface</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>Deseja gravar as alterações feitas ao ficheiro %1?</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>Deseja gravar as alterações feitas ao ficheiro de dados?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Guardar alterações?</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&apos;t save them.</source>
         <translation>As alterações serão perdidas se não forem gravadas.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation>Termine de editar este mergulho antes de editar um outro.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Gravar ficheiro como</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>Aviso</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>Ficheiros UDDF  (*.uddf *.UDDF)</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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1228,239 +1318,259 @@ Por favor, remova-os primeiro</translation>
         <translation>Gráfico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation>Língua</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listas e tabelas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Tamanho da fonte</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Mergulhos</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>Ficheiro de mergulhos padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Mostrar inválidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Garrafa padrão</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>Usar a Garrafa padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Métrico</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personalizar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Metro</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Pés</translation>
+        <source>meter</source>
+        <translation>metro</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Pressão</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation>pés</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volume</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Litro</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation>litro</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
         <translation>pés cúbicos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatura</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation>celsius</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation>fahrenheit</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation>pO₂</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation>pN₂</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Peso</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation>Linguagem do sistema</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filtros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Pressão</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volume</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatura</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Peso</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>libra</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Unidades de tempo</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>Denominador da velocidade de subida/descida</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minutos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Segundos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Mostrar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>limite</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation>ppO₂ máxima</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>EAD END EADD</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>Tecto reportado pelo computador de mergulho</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>pintar o tecto de vermelho</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Tecto calculado</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>mostrar todos os tecidos</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>incrementos de 3 m</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>Calcular NDL/TTS</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>GFlow à profundidade máxima</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Diversos</translation>
     </message>
@@ -1470,32 +1580,37 @@ Por favor, remova-os primeiro</translation>
         <translation>Preferências</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>PpO2 máxima</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
-        <translation>SAC</translation>
+        <translation>Consumo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFlow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.cpp" line="187"/>
+        <location filename="../qt-ui/preferences.cpp" line="193"/>
+        <source>Restart required</source>
+        <translation>É necessário reiniciar a aplicação</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="194"/>
+        <source>To correctly load a new language you must restart Subsurface.</source>
+        <translation>Para alterar a linguagem é necessário reiniciar o Subsurface.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Abrir o logbook padrão</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>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1503,12 +1618,22 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Print</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation>%Previsão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation>Im&amp;primir</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation>&amp;Fechar</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Imprimir</translation>
     </message>
@@ -1516,37 +1641,37 @@ Por favor, remova-os primeiro</translation>
 <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>Mergulho #</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Profundidade</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Duração</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Padrão</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
-        <translation>Parceiro</translation>
+        <translation>Companheiros</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
@@ -1710,30 +1835,45 @@ Por favor, remova-os primeiro</translation>
         <translation>Editar</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>Pn2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation>PHE</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>ar</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>EAN%1</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>Troca de emergência para circuito aberto</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>iniciar</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>fim</translation>
@@ -1742,72 +1882,72 @@ Por favor, remova-os primeiro</translation>
 <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>desconhecido</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>Mergulho #%1 - %2</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>Prof. Máxima: %1 %2</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>Duração: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gás usado:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>Consumo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>CNS máximo:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Lastro:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Guia:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
-        <translation>Companheiro:</translation>
+        <translation>Companheiros:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Fato:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Visibilidade:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Classificação:</translation>
     </message>
@@ -1825,11 +1965,6 @@ Por favor, remova-os primeiro</translation>
         <translation>Remover este ponto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Não existem coordenadas - mova o mapa e dê um duplo clique para seleccionar o local de mergulho</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Encerrar</translation>
@@ -1849,6 +1984,11 @@ Por favor, remova-os primeiro</translation>
         <source>Maximum</source>
         <translation>Máxima</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>Mova o mapa e dê um duplo clique para definir o local de mergulho</translation>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1917,37 +2057,42 @@ Por favor, remova-os primeiro</translation>
 <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>Serviço web</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Espere um pouco até termos algo...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Ligar ...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation>Descarga terminada</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Transferência terminada</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation>Erro na descarga: %1</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Erro de ligação:</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>Identificação de utilizador inválida !</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>Não é possível analisar a resposta !</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Operação de transferência bem sucedida!</translation>
     </message>
@@ -1963,17 +2108,17 @@ Por favor, remova-os primeiro</translation>
 <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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1981,7 +2126,7 @@ Por favor, remova-os primeiro</translation>
 <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>Informação</translation>
     </message>
@@ -1989,12 +2134,12 @@ Por favor, remova-os primeiro</translation>
 <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>Descrição</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2027,30 +2172,40 @@ Por favor, remova-os primeiro</translation>
         <translation>ID do utilizador</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Carregar</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation>A operação demorou demasiado tempo</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation>A transferir dados...</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>Tipo</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Peso</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>Ao clicar aqui irá remover este sistema de lastro</translation>
     </message>
@@ -2058,79 +2213,79 @@ Por favor, remova-os primeiro</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>Ano
 &gt;Mês / Viagem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Duração
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Média</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Mais curto</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Mais longo</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>Profundidade (%1)
 Média</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>
 Mínimo</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>
 Máximo</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>Consumo (%1)
 Médio</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>Temperatura (%1)
@@ -2146,53 +2301,53 @@ Média</translation>
     </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>bar</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>psi</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>l</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>pés cúbicos</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>m</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>pés</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>libras</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>kg</translation>
     </message>
@@ -2241,8 +2396,8 @@ Média</translation>
         <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 &apos;%s&apos;</source>
         <translation>Falha na leitura de &apos;%s&apos;</translation>
     </message>
@@ -2253,8 +2408,8 @@ Média</translation>
         <translation>Não foi possível ler &apos;%s&apos;. Use importar para ficheiros CSV.</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>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation>
     </message>
@@ -2601,133 +2756,133 @@ baseado em GFlow = %.0f  e  GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Tecto calculado %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Tecido %.0fmin: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Paragem de segurança:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 Consumo:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Paragem de segurança: tempo desconhecido @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco: Duração desconhecida @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 Em descompressão</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2738,97 +2893,97 @@ PNE:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Descompressão:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 Em descompressão (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 mergulhos)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 mergulho)</translation>
     </message>
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index 8e4c4f4d7..f50c4433d 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -62,12 +62,12 @@
         <translation>Шаблоны</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>Журнал в формате CSV</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>CSV файлы (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Объем</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Раб.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Нач.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Кон.давл.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Замена на</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Удалить этот баллон.</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>Баллон не может быть удален</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>Нельзя удалять баллоны, которые используются в погружении.</translation>
     </message>
@@ -153,22 +153,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>Модель</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Идентификатор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Имя устройства</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>Удалить этот дайв-компьютер.</translation>
     </message>
@@ -176,12 +176,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>л/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>куб.фут/мин</translation>
     </message>
@@ -194,87 +194,82 @@
         <translation>Показать поле поиска</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation>Показывать:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>развернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>свернуть все</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>свернуть остальные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation>удалить погружение(-я) из поездки</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation>создать новую поездку выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation>добавить к поездке выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation>объединить с поездкой выше</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation>объединить с поездкой ниже</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>удалить погружение(-я)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation>экспорт UDDF</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>сдвинуть время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation>Сохранить погружения как...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation>Сохранить как</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>объединить выбранные </translation>
     </message>
@@ -302,23 +297,17 @@
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Последняя остановка на 6м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Начало</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Атмосферное давление</translation>
     </message>
@@ -407,72 +396,143 @@ 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>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>фут</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>костюм</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>местоположение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>макс.CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -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>Погружение</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>Местонахождение</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>Примечания</translation>
     </message>
@@ -628,191 +688,188 @@ Please, remove them first.</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Исп. газы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Расход газа</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Макс. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Ср. глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Давление воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Температура воздуха</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Температура воды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Время погр.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Соленость</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Статистика</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Общее время</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Погружения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Баллоны</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Добавить баллон</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Грузы</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>Добавить груз</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Местонахождение поездки</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>Заметки к поездке</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Отмена</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>Редактирование поездки.</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>Множественное редактирование.</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>Редактирование погружения.</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>/мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>неизвестно</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>С</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>Ю</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>В</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>З</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>Импорт файлов</translation>
     </message>
@@ -1154,58 +1211,89 @@ Please, remove them first.</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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>Сохраните или отмените изменения перед закрытием файла.</translation>
+    </message>
+    <message>
+        <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>Сохраните или отмените изменения перед открытием планировщика.</translation>
+    </message>
+    <message>
+        <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>Сохраните или отмените изменения перед добавлением погружения.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Руководство пользователя</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Руководство не найдено</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>Сохранить изменения в файле %1?</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>Сохранить изменения в файле журнала?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Сохранить изменения?</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&apos;t save them.</source>
         <translation>Изменения будут утеряны, если вы не сохраните их.</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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation>Закончите редактирование прежде чем редактировать другое.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation>Сохранить как</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>Предупреждение</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="108"/>
+        <source>Please save or cancel the current dive edit before opening a new file.</source>
+        <translation>Сохраните или отмените изменения перед открытием нового файла.</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation>UDDF файлы (*.uddf *.UDDF)</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>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1228,239 +1316,259 @@ Please, remove them first.</source>
         <translation>Профиль</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Списки и таблицы</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Погружения</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>Журнал по умолчанию</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Показывать ошибочные</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Баллон по умолчанию</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>Использовать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>Система мер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Метрическая</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Имперская</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Настроить</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Глубина</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>метр</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>фут</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Давление</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>бар</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>Бар</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Объем</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>литр</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>куб. фут</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Температура</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Цельсий</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Фаренгейт</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Вес</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
         <translation>кг</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Фильтр</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Давление</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Объем</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Температура</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>фунт</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Единицы времени</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>Делитель скорости спуска/подъема</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Минуты</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Секунды</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Показывать</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>порог</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Потолок компьютера</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>потолок красным</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Расчётный потолок</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>все ткани</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>шаг 3м</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>Рассчитывать NDL/TTS</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>GFLow на макс. грубине</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Разное</translation>
     </message>
@@ -1470,32 +1578,37 @@ Please, remove them first.</source>
         <translation>Предпочтения</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>макс PPO2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Журнал по умолчанию</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>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1503,12 +1616,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>Печать</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Печать</translation>
     </message>
@@ -1516,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>Погр#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Глуб.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Инструктор</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Партнер</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Местонахождение</translation>
     </message>
@@ -1710,30 +1833,45 @@ Please, remove them first.</source>
         <translation>Редактировать</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>воздух</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>EAN%1</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>Переход на Откр. Цикл</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> начало</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> конец</translation>
@@ -1742,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>неизвестно</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>Погружение №%1 - %2</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>Макс. глубина: %1 %2</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>Длительность: %1 мин</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Газы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Макс. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Грузы:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Заметки:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Инструктор:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Напарник:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Костюм:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Видимость:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Рейтинг:</translation>
     </message>
@@ -1825,11 +1963,6 @@ Please, remove them first.</source>
         <translation>Удалить эту точку</translation>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation>Не указано местоположение. Выберите место на карте двойным щелчком мыши.</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Закрыть</translation>
@@ -1849,6 +1982,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>Максимум</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1917,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>Вебсервис</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Подождите немного...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Соединение...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Загрузка завершена</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Ошибка соединения:</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>Неверный идентификатор пользователя!</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>Невозможно разобрать ответ!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Успешная загрузка!</translation>
     </message>
@@ -1963,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>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>мл</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>Бар</translation>
     </message>
@@ -1981,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>Информация</translation>
     </message>
@@ -1989,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>Описание</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
@@ -2027,30 +2170,40 @@ Please, remove them first.</source>
         <translation>ID пользователя</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Выгрузить</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Тип</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Вес</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>Удалить эту грузовую систему.</translation>
     </message>
@@ -2058,79 +2211,79 @@ 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 
  &gt; Month / Trip</source>
         <translation>Год 
  &gt; Месяц / Поездка</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>№</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Длительность
 Общее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>
 Среднее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>
 Кратчайшее</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>
 Самое долгое</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>Глубина (%1)
 Среднее</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>
 Минимум</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>
 Максимум</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>SAC (%1)
 Среднее</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>Темп. (%1)
@@ -2146,53 +2299,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>Бар</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>psi</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>л</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>куб. фут</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>м</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>фут</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>фунт</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>кг</translation>
     </message>
@@ -2241,8 +2394,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 &apos;%s&apos;</source>
         <translation>Ошибка чтения &apos;%s&apos;</translation>
     </message>
@@ -2253,8 +2406,8 @@ Maximum</source>
         <translation>Ошибка чтения &apos;%s&apos;. Используйте импорт CSV.</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>Для импорта CSV максимально допустимое кол-во колонок %d</translation>
     </message>
@@ -2600,133 +2753,133 @@ based on GFlow = %.0f and GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 C:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Расчетный потолок %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Ткани %.0fмин: %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Ост.безоп:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 Г:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fл/мин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Ост.безоп:неизв. время @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Деко:%uмин @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Деко:неизв. время @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 В деко</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%uмин</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fбар</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fбар</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fбар</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2737,97 +2890,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Деко:%uмин @ %.0f %s (расч)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 В деко (расч)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%uмин (расч)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%uмин (расч)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sГ:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sГ:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sС:%.2f%s</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>%s %sС:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sД:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 погружений)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 погружение)</translation>
     </message>
diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts
index f6df66c0a..dba99c135 100644
--- a/translations/subsurface_sk_SK.ts
+++ b/translations/subsurface_sk_SK.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Veľkosť</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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>Model</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Voliteľný názov</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"/>
     </message>
@@ -175,12 +175,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"/>
     </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"/>
     </message>
@@ -193,87 +193,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="380"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="695"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="696"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="684"/>
         <source>remove dive(s) from trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="700"/>
+        <location filename="../qt-ui/divelistview.cpp" line="685"/>
         <source>create new trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="686"/>
         <source>add dive(s) to trip immediately above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="704"/>
+        <location filename="../qt-ui/divelistview.cpp" line="689"/>
         <source>merge trip with trip above</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="705"/>
+        <location filename="../qt-ui/divelistview.cpp" line="690"/>
         <source>merge trip with trip below</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="709"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="713"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="714"/>
+        <location filename="../qt-ui/divelistview.cpp" line="699"/>
         <source>export As UDDF</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="715"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="742"/>
+        <location filename="../qt-ui/divelistview.cpp" line="727"/>
         <source>Save Dives As...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="761"/>
+        <location filename="../qt-ui/divelistview.cpp" line="746"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="762"/>
+        <location filename="../qt-ui/divelistview.cpp" line="747"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="711"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation type="unfinished"/>
     </message>
@@ -301,23 +296,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </message>
@@ -405,72 +394,143 @@ 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>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>US libra</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>Spotreba plynu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>max. CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -549,13 +609,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>Poznámky</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>Miesto</translation>
     </message>
@@ -611,7 +671,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>Poznámky</translation>
     </message>
@@ -626,191 +686,188 @@ Please, remove them first.</source>
         <translation>Informácie</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Dátum</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"/>
     </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"/>
     </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"/>
     </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>Spotreba plynu</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Čas Ponoru</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Štatistiky</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Teplota</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Celkový čas</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Ponory</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Fľaše</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>neznámy</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -917,7 +974,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"/>
     </message>
@@ -1152,58 +1209,89 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Otvoriť súbor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Užívateľská príručka</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Uložiť zmeny?</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&apos;t save them.</source>
         <translation type="unfinished"/>
     </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="865"/>
+        <source>First finish the current edition before trying to do another.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="198"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="743"/>
         <source>Save File as</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="197"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="199"/>
         <source>UDDF files (*.uddf *.UDDF)</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1226,239 +1314,259 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Ponory</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>stopa</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Tlak</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>liter</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>kubická stopa</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Teplota</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Závažie</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Tlak</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Teplota</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Závažie</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>US libra</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation type="unfinished"/>
-    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation type="unfinished"/>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1468,32 +1576,37 @@ Please, remove them first.</source>
         <translation>Nastavenia</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>Spotreba plynu</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1501,12 +1614,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1514,37 +1637,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>Ponor č.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Dátum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Hĺbka</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Dĺžka (min)</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Partner</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Miesto</translation>
     </message>
@@ -1708,30 +1831,45 @@ Please, remove them first.</source>
         <translation>Editovať</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>vzduch</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"/>
     </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>Záchrana na OC</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>začiatok</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>koniec</translation>
@@ -1740,72 +1878,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>neznámy</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1823,11 +1961,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/globe.cpp" line="245"/>
-        <source>No location data - move the map and double-click to set the dive location</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Zatvoriť</translation>
@@ -1847,6 +1980,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>Maximum</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1915,37 +2053,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>Webservis</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>Pripájam...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Chyba spojenia</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>Neplatný identifikátor užívateľa!</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>Nemôžem spracovať odpoveď!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Nahrávanie úspešne ukončené!</translation>
     </message>
@@ -1961,17 +2104,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -1979,7 +2122,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"/>
     </message>
@@ -1987,12 +2130,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2025,30 +2168,40 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Heslo</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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Závažie</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"/>
     </message>
@@ -2056,70 +2209,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2134,53 +2287,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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>US libra</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>kg</translation>
     </message>
@@ -2229,8 +2382,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 &apos;%s&apos;</source>
         <translation>Chyba pri načítaní &apos;%s&apos;</translation>
     </message>
@@ -2241,8 +2394,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2588,129 +2741,129 @@ zrátaný s  GFlow = %.0f a GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Vypočítaná hladina %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Bezpečnostná zastávka:%umin @ %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Bezpečnostná zastávka:nezn. čas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:nezn. čas @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 In deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2721,91 +2874,91 @@ END:%d%s
 EADD:%d%s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts
index 9c456cd0f..82d21b1b5 100644
--- a/translations/subsurface_sv_SE.ts
+++ b/translations/subsurface_sv_SE.ts
@@ -62,12 +62,12 @@
         <translation>Förkonfigurerade importer</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>Öppna CSV loggfil</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>CSV Filer (*.csv)</translation>
     </message>
@@ -75,57 +75,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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Storlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>WorkPress</source>
         <translation>Arbetstryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation>Starttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation>Sluttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation>Byt vid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation>He%</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation>Klicka här för att ta bort denna flaska</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>Flaska kan inte tas bort</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>Denna gas används. Bara flaskor som inte används kan tas bort</translation>
     </message>
@@ -153,22 +153,22 @@ radera den valda dykdatorn?</translation>
 <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>Modell</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>Enhetsid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Enhetsnamn</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>Klicka här för att ta bort denna dykdator</translation>
     </message>
@@ -176,12 +176,12 @@ radera den valda dykdatorn?</translation>
 <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> l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation> cuft/min</translation>
     </message>
@@ -194,87 +194,82 @@ radera den valda dykdatorn?</translation>
         <translation>Visa sökruta</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation>Synlig:</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>Expandera alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>Sammanslå alla</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="685"/>
+        <location filename="../qt-ui/divelistview.cpp" line="682"/>
         <source>collapse others</source>
         <translation>kollapsa andra</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>ta bort dyk från resmål</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>skapa nytt resmål ovan</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>lägg till dyk(en) till resmål direkt ovan</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>sammanfoga resmål med resmål ovan</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>sammanfoga resmål med resmål nedan</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>radera dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="701"/>
+        <location filename="../qt-ui/divelistview.cpp" line="698"/>
         <source>save As</source>
         <translation>Spara som</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>Exportera som UDDF fil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="703"/>
+        <location filename="../qt-ui/divelistview.cpp" line="700"/>
         <source>shift times</source>
         <translation>skifta tider</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>Spara dyk som...</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>Spara fil som</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>UDDF filer (*.uddf *.UDDF)</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>Sammanslå dyk</translation>
     </message>
@@ -302,23 +297,17 @@ radera den valda dykdatorn?</translation>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>Sista stoppet på 6m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>Starttid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="184"/>
+        <location filename="../qt-ui/diveplanner.ui" line="181"/>
         <source>ATM Pressure</source>
         <translation>Atmosfärstryck</translation>
     </message>
@@ -407,72 +396,143 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>DiveTripModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1147"/>
+        <location filename="../qt-ui/models.cpp" line="1149"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1154"/>
+        <location filename="../qt-ui/models.cpp" line="1156"/>
         <source>suit</source>
         <translation>dräkt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation>flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>plats</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>maxCNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -551,13 +611,13 @@ vänligen ta bort dessa först.</translation>
     <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>Dykanteckningar</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>Plats</translation>
     </message>
@@ -613,7 +673,7 @@ vänligen ta bort dessa först.</translation>
     </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>Anteckningar</translation>
     </message>
@@ -628,191 +688,188 @@ vänligen ta bort dessa först.</translation>
         <translation>Information</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="403"/>
+        <location filename="../qt-ui/maintab.ui" line="406"/>
         <source>Interval</source>
         <translation>Intervall</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="422"/>
+        <location filename="../qt-ui/maintab.ui" line="425"/>
         <source>Gases Used</source>
         <translation>Gasanvändning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>Gasanvändning</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>Maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>Medeldjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>Lufttryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>Lufttemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>Vattentemperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Dyktid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="612"/>
+        <location filename="../qt-ui/maintab.ui" line="615"/>
         <source>Salinity</source>
         <translation>Salthalt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Statistik</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Temperatur</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Total tid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Dyk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Flaskor</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="79"/>
+        <location filename="../qt-ui/maintab.cpp" line="74"/>
         <source>Add Cylinder</source>
         <translation>Lägg till flaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation>Vikter</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>Lägg till Viktsystem</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>Resmål</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>Resmålsanteckningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Spara</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>Avbryt</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>Detta resmål håller på och ändras.</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>Flera dyk håller på och ändras.</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>Detta dyk håller på och ändras.</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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>okänd</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -919,7 +976,7 @@ vänligen ta bort dessa först.</translation>
     <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>Importera filer</translation>
     </message>
@@ -1154,84 +1211,89 @@ vänligen ta bort dessa först.</translation>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Öppna fil</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>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker planera ett dyk.</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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Användarmanual</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>Kan inte hitta Subsurface manualen</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>Vill du spara ändringarna gjorda i filen %1?</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>Vill du spara ändringarna gjorda i datafilen?</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Spara ändringar?</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&apos;t save them.</source>
         <translation>Ändringar förloras om du inte sparar dom.</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>Först avsluta den aktuella upplagan du försöker göra en annan.</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>Spara fil som</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>Varning</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>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</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>UDDF filer (*.uddf *.UDDF)</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1254,239 +1316,259 @@ vänligen ta bort dessa först.</translation>
         <translation>Graf</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation>Listor och tabeller</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>Fontstorlek</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Dyk</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>Standard dykfil</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="187"/>
+        <location filename="../qt-ui/preferences.ui" line="197"/>
         <source>Display Invalid</source>
         <translation>Display ogiltig</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="204"/>
+        <location filename="../qt-ui/preferences.ui" line="214"/>
         <source>Default Cylinder</source>
         <translation>Standardflaska</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>Använd standardflaska</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>System</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation>Metrisk</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation>Imperial</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation>Personifiera</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>meter</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>fot</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Tryck</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
         <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>Volym</translation>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>liter</translation>
+        <location filename="../qt-ui/preferences.ui" line="378"/>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>ft^3</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Temperatur</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Celsius</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Fahrenheit</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Vikt</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Tryck</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>Volym</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Temperatur</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Vikt</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>pund</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>Tidsenheter</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>Hastighetsnämnare.</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>Minuter</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>Sekunder</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation>Visa</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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>Tröskel</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="662"/>
+        <location filename="../qt-ui/preferences.ui" line="672"/>
         <source>EAD END EADD</source>
         <translation>EAD END EADD</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>Dykdator rapporterade tak</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>Visa tak i rött</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="705"/>
+        <location filename="../qt-ui/preferences.ui" line="715"/>
         <source>Calculated ceiling</source>
         <translation>Visa beräknad tak-information</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>Visa alla vävnader</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="738"/>
+        <location filename="../qt-ui/preferences.ui" line="748"/>
         <source>3m increments</source>
         <translation>Inkrement 3m</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>Beräkna NDL/TTS</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>GFLow på maxdjup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation>Blandat</translation>
     </message>
@@ -1496,32 +1578,37 @@ vänligen ta bort dessa först.</translation>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation>max PP02</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="777"/>
+        <location filename="../qt-ui/preferences.ui" line="787"/>
         <source>GFLow</source>
         <translation>GFLow</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation>GFHigh</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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation>Välj standard loggfil</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>Subsurface XML filer (*.ssrf *.xml *.XML)</translation>
     </message>
@@ -1529,12 +1616,22 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>&amp;Skriv ut</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation>Skriv ut</translation>
     </message>
@@ -1542,37 +1639,37 @@ vänligen ta bort dessa först.</translation>
 <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>Dyknr</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Djup</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Varaktighet</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>master</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Parkamrat</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Plats</translation>
     </message>
@@ -1736,30 +1833,45 @@ vänligen ta bort dessa först.</translation>
         <translation>Redigera</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>luft</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>EAN%1</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>Bailout till öppet system</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>start</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>slut</translation>
@@ -1768,72 +1880,72 @@ vänligen ta bort dessa först.</translation>
 <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>okänd</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>Dyk #%1 - %2</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>Maxdjup: %1 %2</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>Varaktighet: %1 min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1620"/>
+        <location filename="../qt-ui/models.cpp" line="1638"/>
         <source>Gas Used:</source>
         <translation>Gas använd:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation>SAC:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1624"/>
+        <location filename="../qt-ui/models.cpp" line="1642"/>
         <source>Max. CNS:</source>
         <translation>Max. CNS:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation>Vikter:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>Anteckningar:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>Divemaster:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>Parkamrat:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>Dräkt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation>Sikt:</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation>Ranking:</translation>
     </message>
@@ -1851,11 +1963,6 @@ vänligen ta bort dessa först.</translation>
         <translation>Ta bort denna punkt</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>Inga platsuppgifter - flytta kartan och dubbelklicka för att ställa in dykplats</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Stäng</translation>
@@ -1875,6 +1982,11 @@ vänligen ta bort dessa först.</translation>
         <source>Maximum</source>
         <translation>Maximum</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1943,37 +2055,42 @@ vänligen ta bort dessa först.</translation>
 <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>Webbtjänst</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="116"/>
-        <source>Wait a bit until we have something...</source>
-        <translation>Vänta ett litet tag innan vi har något...</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="260"/>
+        <source>Connecting...</source>
+        <translation>Kontaktar...</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
-        <translation>Nedladdning klar</translation>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
+        <translation type="unfinished"/>
     </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Kontaktfel:</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>Ogiltigt användarid!</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>Kan inte tolka respons</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Nedladdning lyckades!</translation>
     </message>
@@ -1989,17 +2106,17 @@ vänligen ta bort dessa först.</translation>
 <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>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation>ml</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2007,7 +2124,7 @@ vänligen ta bort dessa först.</translation>
 <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>Information</translation>
     </message>
@@ -2015,12 +2132,12 @@ vänligen ta bort dessa först.</translation>
 <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>Beskrivning</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2053,30 +2170,40 @@ vänligen ta bort dessa först.</translation>
         <translation>Användarid</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>Ladda upp</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Typ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Vikt</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>Klicka här för att ta bort detta viktsystem</translation>
     </message>
@@ -2084,76 +2211,76 @@ vänligen ta bort dessa först.</translation>
 <context>
     <name>YearlyStatisticsModel</name>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1419"/>
+        <location filename="../qt-ui/models.cpp" line="1421"/>
         <source>Year 
  &gt; Month / Trip</source>
         <translation>År
 &gt; Månad / Resmål</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1421"/>
+        <location filename="../qt-ui/models.cpp" line="1423"/>
         <source>Duration 
  Total</source>
         <translation>Varaktighet
 Total</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation>Genomsnitt</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation>Kortaste</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation>Längsta</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>Djup (%1)
 Medel</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>
 Minimum</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>
 Maximum</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>SAC (%1)
 Medel</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>Temp. (%1)
@@ -2169,53 +2296,53 @@ Medel</translation>
     </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>bar</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>psi</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>l</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>ft³</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>m</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>ft</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>pund</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>kg</translation>
     </message>
@@ -2264,8 +2391,8 @@ Medel</translation>
         <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 &apos;%s&apos;</source>
         <translation>Kunde inte öppna &apos;%s&apos;</translation>
     </message>
@@ -2276,8 +2403,8 @@ Medel</translation>
         <translation>Misslyckades att läsa %s&apos;. Använd Import av CSV filer</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>Maximalt antalet kolumner i CSV import är %d</translation>
     </message>
@@ -2623,133 +2750,133 @@ baserad på GFlow = %.0f och GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation>%s
 V:%.2f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Beräknat tak %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1308"/>
+        <location filename="../profile.c" line="1309"/>
         <source>%s
 Tissue %.0fmin: %.0f %s</source>
         <translation>%s
 Vävnad %.0fmin: %0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Såkerhetsstopp:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1199"/>
+        <location filename="../profile.c" line="1200"/>
         <source>@:%d:%02d
 D:%.1f %s</source>
         <translation>@:%d:%02d
 D:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation>%s
 SAC:%2.1fl/min</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Säkerhetsstopp:okänd tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deko:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deko:okänd tid @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 i deko</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2760,97 +2887,97 @@ END:%d%s
 EADD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1280"/>
+        <location filename="../profile.c" line="1281"/>
         <source>%s
 Deco:%umin @ %.0f %s (calc)</source>
         <translation>%s
 Deko:%umin @ %.0f %s (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation>%s
 i deko (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation>%s
 NDL:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation>%s
 TTS:%umin (calc)</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation>%sT: %d:%02d min</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>%s %sD:%.1f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation>%s %sD:%.1f%s
 </translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation>%s%sV:%.2f%s</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>%s %sV:%.2f%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation>%s %sP:%d %s</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation>C</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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>%1, %2 %3, %4 %5:%6</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>%1 %2, %3
 %4:%5</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="486"/>
+        <location filename="../qt-gui.cpp" line="495"/>
         <source>%1 %2 (%3 dives)</source>
         <translation>%1 %2 (%3 dyk)</translation>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="491"/>
+        <location filename="../qt-gui.cpp" line="500"/>
         <source>%1 %2 (1 dive)</source>
         <translation>%1 %2 (1 dyk)</translation>
     </message>
diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts
index 47914238a..439b3bff0 100644
--- a/translations/subsurface_vi.ts
+++ b/translations/subsurface_vi.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -75,57 +75,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>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>Kích thước</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -152,22 +152,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>Mô hình</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>Tên</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"/>
     </message>
@@ -175,12 +175,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"/>
     </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"/>
     </message>
@@ -193,87 +193,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -301,23 +296,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation type="unfinished"/>
-    </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"/>
     </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"/>
     </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"/>
     </message>
@@ -405,72 +394,143 @@ 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>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>nhỏ nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>CNS tối đa</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -549,13 +609,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>Ghi chú về lần lặn</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>Địa điểm</translation>
     </message>
@@ -611,7 +671,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>Ghi chú</translation>
     </message>
@@ -626,191 +686,188 @@ Please, remove them first.</source>
         <translation>Thông tin lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>Ngày tháng</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"/>
     </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"/>
     </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"/>
     </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>SAC</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>Thời gian lặn</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>Trạng thái</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>Nhiệt độ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>Tổng số thời gian</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>Lần lặn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>Xilanh</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>Lưu lại</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>chưa rõ</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -917,7 +974,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"/>
     </message>
@@ -1152,84 +1209,89 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>Mở tập tin</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>Hướng dẫn sử dụng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>Lưu các thay đổi?</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&apos;t save them.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -1252,239 +1314,259 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="131"/>
+        <location filename="../qt-ui/preferences.ui" line="115"/>
+        <source>Language</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>Lần lặn</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="253"/>
+        <location filename="../qt-ui/preferences.ui" line="263"/>
         <source>Metric</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>Mét</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>Feet</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>Áp suất</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <location filename="../qt-ui/preferences.ui" line="341"/>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
+        <location filename="../qt-ui/preferences.ui" line="351"/>
+        <source>psi</source>
+        <translation>psi</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="368"/>
+        <source>liter</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Lít</translation>
+        <location filename="../qt-ui/preferences.ui" line="395"/>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>CuFt</translation>
+        <location filename="../qt-ui/preferences.ui" line="405"/>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>Nhiệt độ</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>ký</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>Độ C</translation>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>Độ F</translation>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>Bộ lọc</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>Cân nặng</translation>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>Áp suất</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>Nhiệt độ</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>Cân nặng</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="492"/>
+        <location filename="../qt-ui/preferences.ui" line="502"/>
         <source>Show</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation type="unfinished"/>
-    </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation type="unfinished"/>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1494,32 +1576,37 @@ Please, remove them first.</source>
         <translation>Tùy biến</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1527,12 +1614,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1540,37 +1637,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>Lần lặn#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>Ngày tháng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>Độ sâu</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>Độ dài</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>Giỏi nhất</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>Bạn</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>Địa điểm</translation>
     </message>
@@ -1734,30 +1831,45 @@ Please, remove them first.</source>
         <translation>Chỉnh sửa</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>không khí</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"/>
     </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>Thoát đến OC</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>bắt đầu</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>kết thúc</translation>
@@ -1766,72 +1878,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>chưa rõ</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1644"/>
+        <location filename="../qt-ui/models.cpp" line="1662"/>
         <source>Viz:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1849,11 +1961,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>Đóng lại</translation>
@@ -1873,6 +1980,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>Tối đa</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1941,37 +2053,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>Dịch vụ web</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>Đang kết nối...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>Lỗi kết nối:</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>Nhận dạng người dùng không hợp lệ!</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>Không nhận được trả lời!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>Tải về thành công!</translation>
     </message>
@@ -1987,17 +2104,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2005,7 +2122,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"/>
     </message>
@@ -2013,12 +2130,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>ký</translation>
     </message>
@@ -2051,30 +2168,40 @@ Please, remove them first.</source>
         <translation>Số hiệu người dùng</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>Mật khẩu</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"/>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>Loại</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>Cân nặng</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"/>
     </message>
@@ -2082,70 +2209,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2160,53 +2287,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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>lbs</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>ký</translation>
     </message>
@@ -2255,8 +2382,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 &apos;%s&apos;</source>
         <translation>Thất bại khi đọc dữ liệu &apos;%s&apos;</translation>
     </message>
@@ -2267,8 +2394,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2614,129 +2741,129 @@ dựa trên GFlow = %.0f và GFhigh = %.0f
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 Trần đã tính toán %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 Dừng an toàn:%umin @ %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 Dừng an toàn:chưa rõ thời gian @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:chưa rõ thời gian @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 Trong deco</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2747,91 +2874,91 @@ END:%d%s
 EADD:%d%s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts
index 7bf0c0809..a9bfa6260 100644
--- a/translations/subsurface_zh_TW.ts
+++ b/translations/subsurface_zh_TW.ts
@@ -62,12 +62,12 @@
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/csvimportdialog.cpp" line="69"/>
+        <location filename="../qt-ui/csvimportdialog.cpp" line="71"/>
         <source>CSV Files (*.csv)</source>
         <translation>CSV 檔案 (*.csv)</translation>
     </message>
@@ -75,57 +75,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>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Size</source>
         <translation>容量</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>StartPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>EndPress</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
-        <source>O2%</source>
-        <translation>O2%</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>Switch at</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="66"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
         <source>He%</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="164"/>
+        <location filename="../qt-ui/models.cpp" line="68"/>
+        <source>O</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/models.cpp" line="166"/>
         <source>Clicking here will remove this cylinder.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </message>
@@ -153,22 +153,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>模型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Device ID</source>
         <translation>裝置ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1243"/>
+        <location filename="../qt-ui/models.cpp" line="1245"/>
         <source>Nickname</source>
         <translation>別名</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"/>
     </message>
@@ -176,12 +176,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>l/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1106"/>
+        <location filename="../qt-ui/models.cpp" line="1108"/>
         <source> cuft/min</source>
         <translation>cuft/min</translation>
     </message>
@@ -194,87 +194,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="368"/>
-        <source>Visible:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/divelistview.cpp" line="683"/>
+        <location filename="../qt-ui/divelistview.cpp" line="680"/>
         <source>expand all</source>
         <translation>全部展開</translation>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="684"/>
+        <location filename="../qt-ui/divelistview.cpp" line="681"/>
         <source>collapse all</source>
         <translation>全部摺疊</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="697"/>
+        <location filename="../qt-ui/divelistview.cpp" line="694"/>
         <source>delete dive(s)</source>
         <translation>刪除潛水(s)</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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/divelistview.cpp" line="699"/>
+        <location filename="../qt-ui/divelistview.cpp" line="696"/>
         <source>merge selected dives</source>
         <translation>合併所選擇的潛水</translation>
     </message>
@@ -302,23 +297,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="105"/>
-        <location filename="../qt-ui/diveplanner.ui" line="118"/>
-        <source>%</source>
-        <translation>%</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>最後於 6 米停留</translation>
     </message>
     <message>
-        <location filename="../qt-ui/diveplanner.ui" line="177"/>
+        <location filename="../qt-ui/diveplanner.ui" line="174"/>
         <source>Start Time</source>
         <translation>開始時間</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"/>
     </message>
@@ -406,72 +395,143 @@ 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>#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1148"/>
+        <location filename="../qt-ui/models.cpp" line="1150"/>
         <source>date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>m</source>
         <translation>m</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1150"/>
+        <location filename="../qt-ui/models.cpp" line="1152"/>
         <source>ft</source>
         <translation>ft</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1151"/>
+        <location filename="../qt-ui/models.cpp" line="1153"/>
         <source>min</source>
         <translation>min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1153"/>
+        <location filename="../qt-ui/models.cpp" line="1155"/>
         <source>lbs</source>
         <translation>lbs</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1155"/>
+        <location filename="../qt-ui/models.cpp" line="1157"/>
         <source>cyl</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1160"/>
+        <location filename="../qt-ui/models.cpp" line="1162"/>
         <source>location</source>
         <translation>位置</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1157"/>
+        <location filename="../qt-ui/models.cpp" line="1159"/>
         <source>SAC</source>
         <translation>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1158"/>
+        <location filename="../qt-ui/models.cpp" line="1160"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1159"/>
+        <location filename="../qt-ui/models.cpp" line="1161"/>
         <source>maxCNS</source>
         <translation>最大 CNS</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="376"/>
+        <source>Expected XML tag &apos;DiveDateReader&apos;, got instead &apos;%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="422"/>
+        <source>Expected XML tag &apos;DiveDates&apos; not found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="429"/>
+        <source>Malformed XML response. Line %1: %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="474"/>
+        <source>Uploading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="505"/>
+        <source>Downloading dive list...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="553"/>
+        <source>Downloading %1 dives...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/>
+        <source>Download finished - %1</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="615"/>
+        <source>The archive could not be opened:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="625"/>
+        <source>The archive contains corrupt data:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="646"/>
+        <source>Upload finished</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="663"/>
+        <source>Download error: %1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>DownloadFromDCWidget</name>
     <message>
         <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="109"/>
@@ -550,13 +610,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>潛水筆記</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>位置</translation>
     </message>
@@ -612,7 +672,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>記錄</translation>
     </message>
@@ -627,191 +687,188 @@ Please, remove them first.</source>
         <translation>潛水資訊</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="384"/>
+        <location filename="../qt-ui/maintab.ui" line="387"/>
         <source>Date</source>
         <translation>日期</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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="441"/>
+        <location filename="../qt-ui/maintab.ui" line="444"/>
         <source>Gas Consumed</source>
         <translation>氣體消耗</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>SAC</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="479"/>
+        <location filename="../qt-ui/maintab.ui" line="482"/>
         <source>Max. Depth</source>
         <translation>最大深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="498"/>
+        <location filename="../qt-ui/maintab.ui" line="501"/>
         <source>Ave. Depth</source>
         <translation>平均深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="517"/>
+        <location filename="../qt-ui/maintab.ui" line="520"/>
         <source>OTU</source>
         <translation>OTU</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="536"/>
+        <location filename="../qt-ui/maintab.ui" line="539"/>
         <source>Air Pressure</source>
         <translation>殘壓</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="555"/>
+        <location filename="../qt-ui/maintab.ui" line="558"/>
         <source>Air Temperature</source>
         <translation>陸上溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="574"/>
+        <location filename="../qt-ui/maintab.ui" line="577"/>
         <source>Water Temperature</source>
         <translation>水溫</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="593"/>
+        <location filename="../qt-ui/maintab.ui" line="596"/>
         <source>Dive Time</source>
         <translation>潛水時間</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="649"/>
+        <location filename="../qt-ui/maintab.ui" line="652"/>
         <source>Stats</source>
         <translation>統計</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="691"/>
+        <location filename="../qt-ui/maintab.ui" line="697"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="703"/>
+        <location filename="../qt-ui/maintab.ui" line="709"/>
         <source>Temperature</source>
         <translation>溫度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="727"/>
+        <location filename="../qt-ui/maintab.ui" line="733"/>
         <source>Duration</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="739"/>
+        <location filename="../qt-ui/maintab.ui" line="745"/>
         <source>Total Time</source>
         <translation>全部時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.ui" line="758"/>
+        <location filename="../qt-ui/maintab.ui" line="764"/>
         <source>Dives</source>
         <translation>潛水</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="78"/>
+        <location filename="../qt-ui/maintab.cpp" line="73"/>
         <source>Cylinders</source>
         <translation>氣瓶</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="82"/>
+        <location filename="../qt-ui/maintab.cpp" line="77"/>
         <source>Weights</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="362"/>
+        <location filename="../qt-ui/maintab.cpp" line="408"/>
         <source>Trip Location</source>
         <translation>旅程位置</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="40"/>
+        <location filename="../qt-ui/maintab.cpp" line="37"/>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="45"/>
+        <location filename="../qt-ui/maintab.cpp" line="41"/>
         <source>Cancel</source>
         <translation>取消</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"/>
     </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"/>
     </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"/>
     </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>/min</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="410"/>
+        <location filename="../qt-ui/maintab.cpp" line="456"/>
         <source>unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>N</source>
         <translation>N</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="905"/>
+        <location filename="../qt-ui/maintab.cpp" line="957"/>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>E</source>
         <translation>E</translation>
     </message>
     <message>
-        <location filename="../qt-ui/maintab.cpp" line="906"/>
+        <location filename="../qt-ui/maintab.cpp" line="958"/>
         <source>W</source>
         <translation>W</translation>
     </message>
@@ -918,7 +975,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>匯入檔案</translation>
     </message>
@@ -1153,84 +1210,89 @@ Please, remove them first.</source>
         <translation>Ctrl+5</translation>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="110"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="111"/>
         <source>Open File</source>
         <translation>開啟檔案</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="495"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="500"/>
+        <source>User Manual</source>
+        <translation>使用者說明</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/mainwindow.cpp" line="504"/>
         <source>Cannot find the Subsurface manual</source>
         <translation>無法找到Subsurface使用說明</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>您是否要對檔案 %1 所做的修改儲存？</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/mainwindow.cpp" line="534"/>
+        <location filename="../qt-ui/mainwindow.cpp" line="548"/>
         <source>Save Changes?</source>
         <translation>儲存變更?</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&apos;t save them.</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
@@ -1253,239 +1315,259 @@ Please, remove them first.</source>
         <translation>圖表</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="141"/>
         <source>Lists and Tables</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="137"/>
+        <location filename="../qt-ui/preferences.ui" line="147"/>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="147"/>
+        <location filename="../qt-ui/preferences.ui" line="157"/>
         <source>Font size</source>
         <translation>字體大小</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="160"/>
+        <location filename="../qt-ui/preferences.ui" line="170"/>
         <source>Dives</source>
         <translation>潛水</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>預設潛水檔案</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="178"/>
+        <location filename="../qt-ui/preferences.ui" line="188"/>
         <source>...</source>
         <translation>...</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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="246"/>
+        <location filename="../qt-ui/preferences.ui" line="256"/>
         <source>System</source>
         <translation>系統</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="263"/>
+        <location filename="../qt-ui/preferences.ui" line="273"/>
         <source>Imperial</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="273"/>
+        <location filename="../qt-ui/preferences.ui" line="283"/>
         <source>Personalize</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="297"/>
+        <location filename="../qt-ui/preferences.ui" line="307"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="304"/>
-        <source>Meter</source>
-        <translation>公尺</translation>
-    </message>
-    <message>
         <location filename="../qt-ui/preferences.ui" line="314"/>
-        <source>Feet</source>
-        <translation>英呎</translation>
+        <source>meter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="324"/>
-        <source>Pressure</source>
-        <translation>壓力</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="331"/>
-        <source>Bar</source>
-        <translation>Bar</translation>
+        <source>feet</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="341"/>
-        <source>Psi</source>
-        <translation>Psi</translation>
+        <source>bar</source>
+        <translation>bar</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="351"/>
-        <source>Volume</source>
-        <translation>容量</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="358"/>
-        <source>Liter</source>
-        <translation>Liter</translation>
+        <source>psi</source>
+        <translation>psi</translation>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="368"/>
-        <source>CuFt</source>
-        <translation>CuFt</translation>
+        <source>liter</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="378"/>
-        <source>Temperature</source>
-        <translation>溫度</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="385"/>
-        <source>Celsius</source>
-        <translation>攝氏</translation>
+        <source>cu ft</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="395"/>
-        <source>Fahrenheit</source>
-        <translation>華氏</translation>
+        <source>celsius</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../qt-ui/preferences.ui" line="405"/>
-        <source>Weight</source>
-        <translation>配重</translation>
+        <source>fahrenheit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="412"/>
-        <source>Kg</source>
-        <translation>Kg</translation>
+        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <source>kg</source>
+        <translation>kg</translation>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="510"/>
+        <source>pO₂</source>
+        <translation type="unfinished"/>
+    </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="551"/>
+        <source>pN₂</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="422"/>
+        <location filename="../qt-ui/preferences.ui" line="837"/>
+        <source>System Default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="857"/>
+        <source>Filter</source>
+        <translation>篩選器</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="334"/>
+        <source>Pressure</source>
+        <translation>壓力</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="361"/>
+        <source>Volume</source>
+        <translation>容量</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="388"/>
+        <source>Temperature</source>
+        <translation>溫度</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="415"/>
+        <source>Weight</source>
+        <translation>配重</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.ui" line="432"/>
         <source>lbs</source>
         <translation>lbs</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="437"/>
+        <location filename="../qt-ui/preferences.ui" line="447"/>
         <source>Time units</source>
         <translation>時間單位</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="450"/>
+        <location filename="../qt-ui/preferences.ui" line="460"/>
         <source>Minutes</source>
         <translation>分</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="460"/>
+        <location filename="../qt-ui/preferences.ui" line="470"/>
         <source>Seconds</source>
         <translation>秒</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="500"/>
-        <source>pO2</source>
-        <translation>pO2</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="541"/>
-        <source>pN2</source>
-        <translation>pN2</translation>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="582"/>
+        <location filename="../qt-ui/preferences.ui" line="592"/>
         <source>pHe</source>
         <translation>pHe</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="623"/>
+        <location filename="../qt-ui/preferences.ui" line="633"/>
         <source>MOD</source>
         <translation>MOD</translation>
     </message>
+    <message utf8="true">
+        <location filename="../qt-ui/preferences.ui" line="656"/>
+        <source>max ppO₂</source>
+        <translation type="unfinished"/>
+    </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="771"/>
+        <location filename="../qt-ui/preferences.ui" line="781"/>
         <source>Misc</source>
         <translation type="unfinished"/>
     </message>
@@ -1495,32 +1577,37 @@ Please, remove them first.</source>
         <translation>環境設定</translation>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="646"/>
-        <source>max PPO2</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qt-ui/preferences.ui" line="759"/>
+        <location filename="../qt-ui/preferences.ui" line="769"/>
         <source>SAC</source>
         <translation>SAC</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/preferences.ui" line="787"/>
+        <location filename="../qt-ui/preferences.ui" line="804"/>
         <source>GFHigh</source>
         <translation type="unfinished"/>
     </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"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/preferences.cpp" line="227"/>
         <source>Open Default Log File</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -1528,12 +1615,22 @@ Please, remove them first.</source>
 <context>
     <name>PrintDialog</name>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="32"/>
-        <source>&amp;Print</source>
-        <translation>列印</translation>
+        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <source>&amp;Preview</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/printdialog.cpp" line="39"/>
+        <location filename="../qt-ui/printdialog.cpp" line="43"/>
+        <source>P&amp;rint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="47"/>
+        <source>&amp;Close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/printdialog.cpp" line="61"/>
         <source>Print</source>
         <translation type="unfinished"/>
     </message>
@@ -1541,37 +1638,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>潛水編號#</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="25"/>
+        <location filename="../qt-ui/printlayout.cpp" line="26"/>
         <source>Date</source>
         <translation>日期</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="26"/>
+        <location filename="../qt-ui/printlayout.cpp" line="27"/>
         <source>Depth</source>
         <translation>深度</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="27"/>
+        <location filename="../qt-ui/printlayout.cpp" line="28"/>
         <source>Duration</source>
         <translation>時間</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="28"/>
+        <location filename="../qt-ui/printlayout.cpp" line="29"/>
         <source>Master</source>
         <translation>專長</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="29"/>
+        <location filename="../qt-ui/printlayout.cpp" line="30"/>
         <source>Buddy</source>
         <translation>潛伴</translation>
     </message>
     <message>
-        <location filename="../qt-ui/printlayout.cpp" line="30"/>
+        <location filename="../qt-ui/printlayout.cpp" line="31"/>
         <source>Location</source>
         <translation>位置</translation>
     </message>
@@ -1735,30 +1832,45 @@ Please, remove them first.</source>
         <translation>編輯</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"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="642"/>
+        <source>PHE</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="666"/>
+        <source>PO2</source>
+        <translation>PO2</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/profilegraphics.cpp" line="754"/>
+        <location filename="../qt-ui/profilegraphics.cpp" line="1006"/>
         <source>air</source>
         <translation>air</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"/>
     </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>跳脫至 OC</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>開始</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>結束</translation>
@@ -1767,72 +1879,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>未知</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1622"/>
+        <location filename="../qt-ui/models.cpp" line="1640"/>
         <source>SAC:</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1626"/>
+        <location filename="../qt-ui/models.cpp" line="1644"/>
         <source>Weights:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1631"/>
+        <location filename="../qt-ui/models.cpp" line="1649"/>
         <source>Notes:</source>
         <translation>記錄：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1638"/>
+        <location filename="../qt-ui/models.cpp" line="1656"/>
         <source>Divemaster:</source>
         <translation>導潛：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1640"/>
+        <location filename="../qt-ui/models.cpp" line="1658"/>
         <source>Buddy:</source>
         <translation>潛伴：</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1642"/>
+        <location filename="../qt-ui/models.cpp" line="1660"/>
         <source>Suit:</source>
         <translation>防寒衣：</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1646"/>
+        <location filename="../qt-ui/models.cpp" line="1664"/>
         <source>Rating:</source>
         <translation type="unfinished"/>
     </message>
@@ -1850,11 +1962,6 @@ Please, remove them first.</source>
         <translation type="unfinished"/>
     </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"/>
-    </message>
-    <message>
         <location filename="../qt-ui/kmessagewidget.cpp" line="58"/>
         <source>Close</source>
         <translation>關閉</translation>
@@ -1874,6 +1981,11 @@ Please, remove them first.</source>
         <source>Maximum</source>
         <translation>最高</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"/>
+    </message>
 </context>
 <context>
     <name>RenumberDialog</name>
@@ -1942,37 +2054,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>網頁服務</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>連結...</translation>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="276"/>
+        <source>Download finished</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="132"/>
-        <source>Download Finished</source>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="290"/>
+        <source>Download error: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="156"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="299"/>
         <source>Connection Error: </source>
         <translation>連結錯誤:</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>錯誤的使用者Id!</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>回覆無法解析!</translation>
     </message>
     <message>
-        <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="302"/>
         <source>Download Success!</source>
         <translation>下載成功!</translation>
     </message>
@@ -1988,17 +2105,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>ml</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="769"/>
+        <location filename="../qt-ui/models.cpp" line="771"/>
         <source>bar</source>
         <translation>bar</translation>
     </message>
@@ -2006,7 +2123,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"/>
     </message>
@@ -2014,12 +2131,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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="641"/>
+        <location filename="../qt-ui/models.cpp" line="643"/>
         <source>kg</source>
         <translation>kg</translation>
     </message>
@@ -2052,30 +2169,40 @@ Please, remove them first.</source>
         <translation>使用者 ID</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="77"/>
+        <location filename="../qt-ui/webservices.ui" line="80"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../qt-ui/webservices.ui" line="91"/>
+        <location filename="../qt-ui/webservices.ui" line="94"/>
         <source>Upload</source>
         <translation>上傳</translation>
     </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="146"/>
+        <source>Operation timed out</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../qt-ui/subsurfacewebservices.cpp" line="165"/>
+        <source>Transfering data...</source>
+        <translation type="unfinished"/>
+    </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>類型</translation>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="401"/>
+        <location filename="../qt-ui/models.cpp" line="403"/>
         <source>Weight</source>
         <translation>配重</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"/>
     </message>
@@ -2083,70 +2210,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 
  &gt; Month / Trip</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1420"/>
+        <location filename="../qt-ui/models.cpp" line="1422"/>
         <source>#</source>
         <translation>#</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"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1422"/>
+        <location filename="../qt-ui/models.cpp" line="1424"/>
         <source>
 Average</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1423"/>
+        <location filename="../qt-ui/models.cpp" line="1425"/>
         <source>
 Shortest</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-ui/models.cpp" line="1424"/>
+        <location filename="../qt-ui/models.cpp" line="1426"/>
         <source>
 Longest</source>
         <translation type="unfinished"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
     </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"/>
@@ -2161,53 +2288,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>bar</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>psi</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>l</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>cuft</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>m</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>ft</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>lbs</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>kg</translation>
     </message>
@@ -2256,8 +2383,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 &apos;%s&apos;</source>
         <translation>無法讀取 &apos;%s&apos;</translation>
     </message>
@@ -2268,8 +2395,8 @@ Maximum</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
@@ -2615,129 +2742,129 @@ Subsurface 潛水計畫
         <translation>ean</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1203"/>
+        <location filename="../profile.c" line="1204"/>
         <source>%s
 P:%d %s</source>
         <translation>%s
 P:%d %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1208"/>
+        <location filename="../profile.c" line="1209"/>
         <source>%s
 T:%.1f %s</source>
         <translation>%s
 T:%.1f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1215"/>
+        <location filename="../profile.c" line="1216"/>
         <source>%s
 V:%.2f %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1301"/>
+        <location filename="../profile.c" line="1302"/>
         <source>%s
 Calculated ceiling %.0f %s</source>
         <translation>%s
 計算的深度 %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1255"/>
+        <location filename="../profile.c" line="1256"/>
         <source>%s
 Safetystop:%umin @ %.0f %s</source>
         <translation>%s
 安全停留:%umin @ %.0f %s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1219"/>
+        <location filename="../profile.c" line="1220"/>
         <source>%s
 SAC:%2.1fl/min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1258"/>
+        <location filename="../profile.c" line="1259"/>
         <source>%s
 Safetystop:unkn time @ %.0f %s</source>
         <translation>%s
 安全停留:未知時間 @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1263"/>
+        <location filename="../profile.c" line="1264"/>
         <source>%s
 Deco:%umin @ %.0f %s</source>
         <translation>%s
 Deco:%umin @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1266"/>
+        <location filename="../profile.c" line="1267"/>
         <source>%s
 Deco:unkn time @ %.0f %s</source>
         <translation>%s
 Deco:時間未知 @ %.0f %s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1272"/>
+        <location filename="../profile.c" line="1273"/>
         <source>%s
 In deco</source>
         <translation>%s
 減壓中</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1275"/>
+        <location filename="../profile.c" line="1276"/>
         <source>%s
 NDL:%umin</source>
         <translation>%s
 NDL:%umin</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1223"/>
+        <location filename="../profile.c" line="1224"/>
         <source>%s
 CNS:%u%%</source>
         <translation>%s
 CNS:%u%%</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1227"/>
+        <location filename="../profile.c" line="1228"/>
         <source>%s
 pO%s:%.2fbar</source>
         <translation>%s
 pO%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1231"/>
+        <location filename="../profile.c" line="1232"/>
         <source>%s
 pN%s:%.2fbar</source>
         <translation>%s
 pN%s:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1235"/>
+        <location filename="../profile.c" line="1236"/>
         <source>%s
 pHe:%.2fbar</source>
         <translation>%s
 pHe:%.2fbar</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1240"/>
+        <location filename="../profile.c" line="1241"/>
         <source>%s
 MOD:%d%s</source>
         <translation>%s
 MOD:%d%s</translation>
     </message>
     <message>
-        <location filename="../profile.c" line="1247"/>
+        <location filename="../profile.c" line="1248"/>
         <source>%s
 EAD:%d%s
 END:%d%s
@@ -2748,91 +2875,91 @@ END:%d%s
 EADD:%d%s</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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1289"/>
+        <location filename="../profile.c" line="1290"/>
         <source>%s
 In deco (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1292"/>
+        <location filename="../profile.c" line="1293"/>
         <source>%s
 NDL:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1296"/>
+        <location filename="../profile.c" line="1297"/>
         <source>%s
 TTS:%umin (calc)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1405"/>
+        <location filename="../profile.c" line="1406"/>
         <source>%sT: %d:%02d min</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1421"/>
+        <location filename="../profile.c" line="1422"/>
         <source>%s %sD:%.1f%s
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1425"/>
+        <location filename="../profile.c" line="1426"/>
         <source>%s%sV:%.2f%s</source>
         <translation type="unfinished"/>
     </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"/>
     </message>
     <message>
-        <location filename="../profile.c" line="1440"/>
+        <location filename="../profile.c" line="1441"/>
         <source>%s %sP:%d %s</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="283"/>
+        <location filename="../qt-gui.cpp" line="291"/>
         <source>C</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qt-gui.cpp" line="287"/>
+        <location filename="../qt-gui.cpp" line="295"/>
         <source>F</source>
         <translation>F</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"/>
     </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"/>
     </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"/>
     </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"/>
     </message>
author	Dirk Hohndel <dirk@hohndel.org>	2013-12-06 13:13:29 -0800
committer	Dirk Hohndel <dirk@hohndel.org>	2013-12-06 13:13:29 -0800
commit	b04666922b9ca9c12007b9d5127a697b78e411b2 (patch)
tree	fa65b1b709f3cd67e5d20642a317c9674d870c7c
parent	2629e768bd2248a652686589186b50bec51fe044 (diff)
download	subsurface-b04666922b9ca9c12007b9d5127a697b78e411b2.tar.gz